Web lists-archives.com

Re: [PATCH v3 3/4] cherry-pick/revert: add scissors line on merge conflict




Phillip Wood <phillip.wood123@xxxxxxxxx> writes:

>>> What are you basing this series on? builtin/rebase--helper.c was removed
>>> last September in 34b47315d9 ("rebase -i: move rebase--helper modes to
>>> rebase--interactive", 2018-09-27)
>> 
>> I was basing this patch on the tip of dl/merge-cleanup-scissors-fix. I
>> can rebase or merge my work to something else but I'll wait for
>> additional directions since I don't know what would be best.
>
> See what Junio says, I think it might be simple enough for him to fix
> that up when he merges it into pu.

Perhaps it is a good time to kick dl/merge-cleanup-scissors-fix out
of the 'next' branch, so that the whole thing can be rebuilt on top
of a more recent base like v2.21.0, without the need for these
"oops, that was wrong, so let's patch it up" fixes.

> I've just realized that if you're cherry-picking a range of commits and
> it stops for a conflict resolution then the new option is not saved.
> You'll need to update populate_opts_cb() and save_opts() in sequencer.c
> to do that.

Yeah, good point.