I have many commits: A, B, C, ..., Z. I plan to do some housekeeping using 
rebase. One thing I want to do is to reorder Z to be the first commit. 
However, other commits will be in conflict with Z's changes. I know I can 
go through and interactively resolve the conflicts manually. But this is 
tedious and error prone. I would like to be able to mark Z's changes as 
authoritative while rebasing. That is, I want to tell git, "whenever a 
commit conflicts with Z (during this rebase operation) I want you to keep 
Z's changes and ignore the other." Is this possible? Is there another 
(hopefully better) way to accomplish what I'm trying to do?

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to