[gmx-developers] Maintaining patch-chains

David van der Spoel spoel at xray.bmc.uu.se
Thu Dec 28 13:10:22 CET 2017


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


More information about the gromacs.org_gmx-developers mailing list