GIT merge successfully but introduce a compilation error

Question

I have to find a situation where git merge the file successfully but there is an compilation error in the program after merging.

Is there any way to do that!!

I know git uses the longest common subsequence for merging.

I have done a lot of trial but not able to find.

If anyone know.... please help

Answer 1

Git merges can occasionally produce non-working code without any conflicts arising. Imagine the following:

• Developer A adds a call to function foo in the code he's working on.
• Developer B modifies function foo's function signature, or renames/deletes the function.
• Developer A merges B's changes.

Now A's function call is incompatible with B's change, but git doesn't know that because they are in separate modules.

What A (you) should do in this case is review the changes that were merged in, and fix the code as appropriate. (This is also why you should keep feature branches short where possible, especially if you are trying to submit a patch upstream).