<div dir="ltr"><div><div><div><div><div>Hi David,<br><br></div>git checkout patchB<br></div>git rebase patchA</div><div><br></div><div>will bring patchA on top of current patchB, and should just work if they don't conflict. <br></div><div><br></div>Alternatively, press the 'Rebase' button on patchB if they're both already on Gerrit :-)<br><br></div>Cheers,<br></div>Aleksei<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 28, 2017 at 1:10 PM, David van der Spoel <span dir="ltr"><<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
I forgot how to maintain patch chains. When I have<br>
master -> patch A -> patch B<br>
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?<br>
<br>
Thanks for any clues!<br>
<br>
Cheers,<span class="HOEnZb"><font color="#888888"><br>
-- <br>
David van der Spoel, Ph.D., Professor of Biology<br>
Head of Department, Cell & Molecular Biology, Uppsala University.<br>
Box 596, SE-75124 Uppsala, Sweden. Phone: <a href="tel:%2B46184714205" value="+46184714205" target="_blank">+46184714205</a>.<br>
<a href="http://www.icm.uu.se" rel="noreferrer" target="_blank">http://www.icm.uu.se</a><br>
-- <br>
Gromacs Developers mailing list<br>
<br>
* Please search the archive at <a href="http://www.gromacs.org/Support/Mailing_Lists/GMX-developers_List" rel="noreferrer" target="_blank">http://www.gromacs.org/Support<wbr>/Mailing_Lists/GMX-developers_<wbr>List</a> before posting!<br>
<br>
* Can't post? Read <a href="http://www.gromacs.org/Support/Mailing_Lists" rel="noreferrer" target="_blank">http://www.gromacs.org/Support<wbr>/Mailing_Lists</a><br>
<br>
* For (un)subscribe requests visit<br>
<a href="https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers" rel="noreferrer" target="_blank">https://maillist.sys.kth.se/ma<wbr>ilman/listinfo/gromacs.org_gmx<wbr>-developers</a> or send a mail to <a href="mailto:gmx-developers-request@gromacs.org" target="_blank">gmx-developers-request@gromacs<wbr>.org</a>.<br>
</font></span></blockquote></div><br></div>