Git conflict but both blocks are the same

Question

I started with a git rebase master and after 1 skip I encountered this conflict:

CONFLICT (content): Merge conflict in web/app/components/Exchange/Exchange.jsx ...

<<<<<<< HEAD

        let highestBid = bids.length > 0 ? bids.reduce((a, b) => {
            return a >= b.price_full ? a : b.price_full;
        }, 0) : 0;

=======

        let highestBid = bids.length > 0 ? bids.reduce((a, b) => {
            return a >= b.price_full ? a : b.price_full;
        }, 0) : 0;

>>>>>>> Minor exchange fixes, ...

The looked the same but since I have seen this before I double-checked the code manually. Both blocks are the same hash after I copy and pasted them to two files..

Any idea on what has happened and how to automatically resolve conflicts like this?

git version 1.9.1

Did these identical lines of code come from 2 different commits? — missimer, Sep 27 '15 at 12:26
Don't forget about specific whitespace - end-of-line symbols. — Roman, Sep 27 '15 at 15:32

score 0 · Accepted Answer · edited May 23 '17 at 12:06

0

In order to quickly check if this is about space issue, you can try (as I mentioned before):

 git rebase --abort # provided you didn't already resolved a ton of other conflicts before
 git rebase -Xignore-space-change master
 # or
 git rebase -Xignore-all-space master

Note that that would not keep your whitespace changes (since rebase invert ours and theirs)

edited May 23 '17 at 12:06

Community

1
1

answered Sep 27 '15 at 14:54

VonC

1,262,500
529
4,410
5,250

Git conflict but both blocks are the same

1 Answers1