[Smtk-developers] The more complicated backport format

[Bob Obara]

Thanks Ben,

I think there maybe an issue when testing merge requests w/r to release - can you checkout the experimental merge request builds for 
Inheriting association info on master and let me know if I’m doing something wrong?

Thanks!

Bob


Robert M. O'Bara, MEng.
Assistant Director of Scientific Computing

Kitware Inc.
28 Corporate Drive
Suite 101
Clifton Park, NY 12065

Phone: (518) 881- 4931




> On Oct 25, 2017, at 9:04 AMEDT, Ben Boeckel <ben.boeckel at kitware.com> wrote:
> 
> 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