Web lists-archives.com

Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

On Thu, Feb 07, 2019 at 10:01:40AM -0800, Junio C Hamano wrote:
> Denton Liu <liu.denton@xxxxxxxxx> writes:
> > I rebased the changes onto the latest 'next' because if this branch gets
> > merged into 'next', there'll be merge conflicts from
> > 'dl/complete-submodule-absorbgitdirs'.
> Please don't do that.
> A topic that depends on everything in 'next' cannot graduate to
> 'master' until everything that is cooking in 'next' does.
> When
>  - the "conflict" that would arise is so trivial to resolve,
>  - there is no semantic crashes between the new topic and existing
>     ones, and
>  - the topic is usable even before other topics graduate (or even
>    when they get discarded)
> please make it a habit to avoid making your topic (i.e. this one)
> hostage to another topic (i.e. the absorbgitdirs one), and certainly
> not hostage to the whole of 'next'.  A trivial conflict resolution
> in this case, if you revert the rebasing and then attempt to merge
> the result to 'next', would look like this.

My mistake, even though I've made a few contributions already, I'm still
getting used to the git.git workflow.

Thanks so much for helping me out and please don't hesitate to let me
know if I'm doing anything else wrong.

By the way, just for the record, how would you like me to handle
patchsets that cause merge conflicts?