A revert of [A] can result in conflicts with the changes you made in [B].

You should handle these conflicts normally (as any other merge conflics in 
git):

1) Git status, see which files have conflicts
2) Resolve the conflicts (picking which changes you would like to keep)
3) git add on the files that are resolved
4) git commit

You'll notice that the commit message is already populated with the Revert 
information, and which files had conflicts (you can change the contents of 
the commit message as you want, of course).

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/4oJ3VyJVYz0J.
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