[Smtk-developers] The more complicated backport format
Ben Boeckel
ben.boeckel at kitware.com
Wed Oct 25 09:04:11 EDT 2017
On Tue, Oct 24, 2017 at 22:04:12 -0400, Bob Obara wrote:
> So I have an example of a branch based on release that needed to be
> merged onto a branch based on master due to merge conflicts - what is
> the format for the backport?
It is one of these cases:
https://gitlab.kitware.com/utils/git-workflow/wikis/Backport-topics#fixing-both-with-conflicts
--Ben
More information about the Smtk-developers
mailing list