Re: [Plplot-devel] PLplot 6 and git

[David M. <da...@as...>]

Hi, Phil,

On May 24, 2015, at 1:37 AM, Phil Rosenberg wrote:

> I'm not sure this is right, but I would assume that if we apply a bug
> fix to the v5 branch then create a patch of this commit and apply that
> to the v6 branch then if we ever merge (or rebase) the branches then
> git is clever enough to not create a conflict. Is this correct?

If the exact same patch is applied, then git is clever enough not to make a conflict on a subsequent merge/rebase.  If the patch needs to be altered slightly to apply it to the v6 branch (e.g. if variable names or indentation have changed slightly on the v6 branch), then I think git will mark it as a conflict on a subsequent merge/rebase, but such cases are usually trivial to resolve.

Dave