Google Groups

A real go back plan


Patrick Apr 17, 2012 10:59 AM
Posted in group: Git for human beings
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?