Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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 --continue and --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 - 1.7.4.4 Ubuntu - 1.7.9.5

share|improve this question
    
@slhck added that info –  Endophage May 25 '12 at 18:06
    
You can easily update Git on OS X through the git-osx-installer or Homebrew. Git's now at 1.7.10, so there might have been some fixes in between. Not a Git expert though. –  slhck May 25 '12 at 18:28
    
@slhck While it's possible and I'll update anyway, I don't think this is a version problem... If I find it is, I'll post an update. –  Endophage May 25 '12 at 18:40
    
Have you compared your ~/.gitconfig across the machines? –  Kevin Reid May 25 '12 at 20:26
    
@KevinReid it's the same. Only defines editor, excludes_file, name and email –  Endophage May 25 '12 at 21:02

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Browse other questions tagged or ask your own question.