On Tue, Apr 17, 2012 at 21:59, Patrick <pn1.d...@gmail.com> 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 into local
history state
2. git reset --hard origin/<branch_name>  # this to reset your local
checkouted branch to the central repo state

Repeat step 2 for every branch you want to reset into central repo
state after checkouting each corresponding local branch


-- 
Serge Matveenko
se...@matveenko.ru
http://www.ohloh.net/accounts/lig
http://ru.linkedin.com/in/sergematveenko

-- 
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