CODEWITHSUNDEEP
gitmergebitbucket
Michael Millar
Michael Millar

Reputation: 1604

fix trivial/inexplicable git conflicts without merging

In a pull request preview on bitbucket, I have some trivial conflicts showing up, like this one, which has a blank line in the source and a blank line in the destination, but git considers it a conflict

+<<<<<<< destination:fdgdfdf35245b453kjb4k63k454

+=======
+        
+>>>>>>> source:34235hj3235g2kighbhjgk4jh25

Now, of course I can run git merge master within the development branch to create the lines above, fix the 'conflict' and push to the remote. But this will mean the branch is merged into master - I'd like it to remain a separate branch. Is this possible? Why does git consider the above to be a conflict anyway?

Upvotes: 1

Views: 249

Answers (1)

Thibault D.
Thibault D.

Reputation: 10104

The bottom part of the diff contains whitespace and the top one does not.

An empty line can still be included in a change and if both of you changed this line, one with whitespaces one without, then you create a conflict.

Upvotes: 2

Related Questions