[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: gtk3 and master double patches should better be applied to master an
From: |
Ben Pfaff |
Subject: |
Re: gtk3 and master double patches should better be applied to master and then merged |
Date: |
Sun, 17 May 2015 14:52:54 -0700 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
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.
- gtk3 and master double patches should better be applied to master and then merged, Friedrich Beckmann, 2015/05/17
- Re: gtk3 and master double patches should better be applied to master and then merged,
Ben Pfaff <=
- Re: gtk3 and master double patches should better be applied to master and then merged, Friedrich Beckmann, 2015/05/17
- Re: gtk3 and master double patches should better be applied to master and then merged, John Darrington, 2015/05/18
- Re: gtk3 and master double patches should better be applied to master and then merged, Friedrich Beckmann, 2015/05/18
- Re: gtk3 and master double patches should better be applied to master and then merged, John Darrington, 2015/05/19
- gtk3 - how it is today / should gtk3 be merged to master?, Friedrich Beckmann, 2015/05/29
- Re: gtk3 - how it is today / should gtk3 be merged to master?, Ben Pfaff, 2015/05/29
- Re: gtk3 - how it is today / should gtk3 be merged to master?, John Darrington, 2015/05/30
- Re: gtk3 - how it is today / should gtk3 be merged to master?, Friedrich Beckmann, 2015/05/30
- Re: gtk3 - how it is today / should gtk3 be merged to master?, John Darrington, 2015/05/31