On Tue, Apr 17, 2012 at 21:59, Patrick wrote:
> 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?
1. git reset --hard # this to reset your local reviewing
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
