CODEWITHSUNDEEP
gitgit-merge
Dominik Teiml
Dominik Teiml

Reputation: 575

Git merge giving unexpected results

We're trying to merge two Git branches.

This is the merge commit.

This is the file link of the source commit. This is the file link of the target commit.

Based on the commit graph: link

commit graph

the closes common ancestor is commit 01886ab, right? Well it one has the following version of the file.

My understanding of git merge is that merging "A" into "B" with base "A" should output "B". Based on that, I have problems with the comments: "The following two/three mappings are symmetrical..." (lines 30/31/32).

In the base file, there is "three". The source file has "two" and the target "three". According to my understanding, it should merge to "two".

It merged to "three" (merge file).

Thank you!!

Upvotes: 0

Views: 148

Answers (1)

Dan
Dan

Reputation: 4169

When I ran this merge locally I got a merge conflict. The conflict was because in commit 6d8450ab64821a280aa0e2d20c42e4929d028812, which is an ancestor of db30386422f648a3e3382f5648e987bfc178d93d, you added whitespace above the line The following...; and in commit 333d343af1ac436eff598231957e9705e4121dab, an ancestor of 2c0135217daa3fefbbc7e73a6ee94682c33a9b81, you changed three to two. Furthermore, if you checkout the merge commit 7f46cd43102b1f63bf0a5416a376b7c880313b1d and run git blame contracts/DutchExchange.sol, you'll see on line 32 that the merge commit introduced a newline. So to answer your question, it looks like it merged to three because that's how you resolved the merge conflict.

Upvotes: 1

Related Questions