[gmx-developers] Maintaining patch-chains

[Aleksei Iupinov]

>will bring patchA on top of current patchB

Of course I messed it up, should have been "will bring patchB on top of
current patchA" :-)

On Thu, Dec 28, 2017 at 1:17 PM, Aleksei Iupinov <a.yupinov at gmail.com>
wrote:

> Hi David,
>
> git checkout patchB
> git rebase patchA
>
> will bring patchA on top of current patchB, and should just work if they
> don't conflict.
>
> Alternatively, press the 'Rebase' button on patchB if they're both already
> on Gerrit :-)
>
> Cheers,
> Aleksei
>
> On Thu, Dec 28, 2017 at 1:10 PM, David van der Spoel <spoel at xray.bmc.uu.se
> > wrote:
>
>> Hi,
>>
>> I forgot how to maintain patch chains. When I have
>> master -> patch A -> patch B
>> and I change patch A, how do I update (rebase?) patch B without getting a
>> load of conflicts if B does not touch the same lines that A does?
>>
>> Thanks for any clues!
>>
>> Cheers,
>> --
>> David van der Spoel, Ph.D., Professor of Biology
>> Head of Department, Cell & Molecular Biology, Uppsala University.
>> Box 596, SE-75124 Uppsala, Sweden. Phone: +46184714205.
>> http://www.icm.uu.se
>> --
>> Gromacs Developers mailing list
>>
>> * Please search the archive at http://www.gromacs.org/Support
>> /Mailing_Lists/GMX-developers_List before posting!
>>
>> * Can't post? Read http://www.gromacs.org/Support/Mailing_Lists
>>
>> * For (un)subscribe requests visit
>> https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers
>> or send a mail to gmx-developers-request at gromacs.org.
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20171228/1ba360f8/attachment.html>