Hi, the merge worked without conflict. No manual resolution is required. The difference is that git has two separate commits when a patch is applied in each branch separately. When applied in master and then merged to gtk3 this is visible and known internally just as one commit. On Sun, May 17, 2015 at 11:46:20PM +0200, Friedrich Beckmann wrote:
some of the recent patches are applied both to master and gtk3 branch. After a merge from master to gtk3 they are still doubled. This
is different when a patch is applied only to master and then merged to gtk3. Below is the gitk view of the project. You see the recent double applied patches twice while the merged SCATTERPLOT patch is mentionend only once.
It's not normally a problem for a patch to apply in two branches.
Usually, Git successfully merges the two branches later.
That said, applying to one branch, then merging to the other, often
works just as well.
|