Skip to main content
  1. Posts/

An Indian developer’s way of handling merge conflict

··92 words·1 min·
Programming Rants Git

So this happened just now with a colleague. He’s been working for few months now.

My way of handling merge conflict:

  1. Open WinMerge to diff
  2. See the conflicting part
  3. Correct the conflicting part by copying the changes to the destination file in WinMerge

His way

  1. Open WinMerge to diff
  2. See the conflicting part
  3. Opens the source file in Windows notepad
  4. Copies the entire contents to clipboard
  5. Opens a new tab in Notepad++
  6. Pastes the contents
  7. Goes to the line to be corrected.
  8. Corrects it.
  9. Copies it.
  10. Pastes the line in Notepad.
  11. Saves.

What is this I don’t even..

Sathyajith Bhat
Sathyajith Bhat
Author, AWS Container Hero and DevOps Specialist.


Salute to Fabrice Bellard
··246 words·2 mins
I probably top the ranks of lazy arses who procrastinate like there’s no tomorrow - and then there’s Fabrice Bellard Amongst others, he’s created/led A 4G LTE base station running entirely in software on a standard PC. A new ASN1 compiler generating small and efficient C code. A PC emulator in Javascript: how much time takes your browser to boot Linux ? 2700 billion decimal digits of Pi computed with a desktop computer.
Fixing FRM-41336: Populate_List: invalid column type for column 2 error in Oracle Forms
··178 words·1 min
Programming Oracle
I spent the past hour and a half trying to fix this stupid error. Here’s the situation: I have a Poplist(aka dropdown list/ list item). The poplist is populated by a query defined in a Record Group. The query is on the lines of select id, name from employees The column types are correctly defined. And yet I kept running into FRM-41336: Populate_List: invalid column type for column error message. Looking at the description for the message:
Troubleshooting Oracle’s ORA-01017 errors
··221 words·2 mins
Programming Oracle
Was writing this for Stack Overflow‘s tag wiki on ORA-01017, thought I’ll post it here as well. ORA-01017 is the error code shown my Oracle when a login attempt to the database was not successful. The full text of the error code is: ORA-01017: invalid username/password; logon denied Cause: An invalid username or password was entered in an attempt to log on to Oracle. The username and password must be the same as was