I run into this problem a couple times and I have not figured out how
to fix it.

-In a central repo environment

-local system A gets new changes pushed up to central repo

-local system B has changes and pulls from the central repo creating a
merge conflict.

After reviewing the merge conflict it is decided to drop the changes
on local system B and match it up with the central repo.

I ultimately have just deleted the local repo on local system B and
checked it out again.

I do want to know when the merge conflict exists so I can check it
but, is there a way to drop the pull that local system B did and pull
the central repo version after I decide review it?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to