Re: [PATCH v2 2/2] [GSOC] ref-filter: add %(raw) atom
- From
ZheNing Hu <adlternative@gmail.com>
- Date
- Jun 1, 2021, 11:00 UTC
- Message-ID
- <CAOLTT8STkD_2vhL7uCt1umgmfGBRKcuF7nWv+DpQ4H0dBSLJ0A@mail.gmail.com>
- In-Reply-To
- <xmqqlf7ut15w.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> 于2021年6月1日周二 下午4:54写道：
Show 16 quoted lines
> > ZheNing Hu <adlternative@gmail.com> writes: > > >> Doesn't this conflict with your own zh/ref-filter-atom-type topic? > >> Shouldn't one build on top of the other? > >> > >> Or did we find something fundamentally broken about the other topic > >> to make us retract it that I do not remember? > >> > >> Thanks. > > > > I am waiting for zh/ref-filter-atom-type to be merged into master. But it > > As you sent this that conflicts with it, clearly you are doing > something else that conflicts with it _without waiting_ ;-). >
OK.
Show 6 quoted lines
> > hasn't happened yet. But if I want to base the current topic on > > zh/ref-filter-atom-type, GGG will send past patches (zh/ref-filter-atom-type) > > repeatedly. > > I thought GGG lets you say "this is based on that other branch, not > on the 'master' branch" to solve that exact issue?
I'm not sure...I will try it after I rebasing this topic to zh/ref-filter-atom-type. I just remember that it looked like something went wrong with my base on your patch last time.[1]
[1] https://lore.kernel.org/git/pull.870.v6.git.1613739235241.gitgitgadget@gmail.com/