GIT pull

My apologies if this isn't the appropriate place to post this. We are using the windows port msysgit so I understand if I need to post over there first.

I have also posted this on stackoverflow. Here is a link to the question there:

http://stackoverflow.com/questions/10110401/why-doesnt-git-clean-up-when-aborting-a-merge-triggered-from-pulling-in-changes

My team has had a lot of trouble with GIT lately because of aborted pull commands.

If a user has local modifications not on the index and does a pull, I have seen git attempt to start applying the merge to master and abort. The whole checkout is then left in a terrible state that is nearly unrecoverable. In the past, I thought GIT would run some sort of check to identify these problems before it attempts the merge.

Even with a clean state (nothing to commit), I have seen the same thing randomly happen at least once. I understand that without rebasing, you may be forced to resolve merge conflicts when you pull, but this is not what is happening though.

We are using gitolite. I am mainly using command line and have yet to run into these issues. The rest of the team is using the git-gui or in 1 case TortoiseGit.

git-gui version 0.13.GITGUI git version 1.7.8.msysgit.0 Tcl/Tk version 8.5.1 TortoiseGit 1.7.6.0

We are not working with branches as much as we could, but feel like this should be working. Why does GIT allow you to try to pull when it is going to train-wreck? Why does GIT not abort cleanly?

-- View this message in context: http://git.661346.n2.nabble.com/GIT-pull-tp7459655p7459655.html Sent from the git mailing list archive at Nabble.com.