Re: [git-users] Can you mark a commit as authoritative in interactive rebase?
Great, thanks for the pointer! There is always something new to learn about git :) On Sep 13, 2013, at 9:11 AM, William Seiti Mizuta wrote: > I am not very sure, but I think you can use the option strategy to what you > want. Reading the documentation, it says > > "using the ours strategy simply discards all patches from the , which > makes little sense" > > So, I think you can use it to discard all changes from the other commits. It > is just a guess. > > > William Seiti Mizuta > @williammizuta > Caelum | Ensino e Inovação > www.caelum.com.br > > > On Fri, Sep 13, 2013 at 9:48 AM, Stoney Jackson wrote: > 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. > > > -- > You received this message because you are subscribed to a topic in the Google > Groups "Git for human beings" group. > To unsubscribe from this topic, visit > https://groups.google.com/d/topic/git-users/O7zQNn1B3fw/unsubscribe. > To unsubscribe from this group and all its topics, send an email to > git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/groups/opt_out. -- 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.
Re: [git-users] Can you mark a commit as authoritative in interactive rebase?
I am not very sure, but I think you can use the option strategy to what you want. Reading the documentation, it says "using the ours strategy simply discards all patches from the , which makes little sense" So, I think you can use it to discard all changes from the other commits. It is just a guess. William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Fri, Sep 13, 2013 at 9:48 AM, Stoney Jackson wrote: > 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. > -- 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.
[git-users] Can you mark a commit as authoritative in interactive rebase?
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.
