This has been driving me somewhat insane but I can't find any information on it. I have both Mac and a Linux (Ubuntu) machines. I work on both but I'm finding Git is behaving very differently during merges and rebases. I've just done exactly the same rebase on both machines (purely for the purpose of establishing if they really are behaving differently). On Ubuntu it went very smoothly. I had to fix conflicts and
git rebase --continue 3 times and when the rebase was complete, everything was as I expected it to be.
On OSX however, I had to resolve dozens of conflicts, use
--skip and at the end, I did not have the expected code. Right off the bat, OSX was identifying different conflicts so even before I had the chance to resolve conflicts differently, the behaviour between the platforms had diverged.
Has anyone else experienced similar issues? I'd really love to work out what is going on as I currently have no confidence in being able to rebase or merge correctly on OSX...
Git versions: OSX - 126.96.36.199 Ubuntu - 188.8.131.52