[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Question on default and gui-release branches
|
From: |
Jordi Gutiérrez Hermoso |
|
Subject: |
Re: Question on default and gui-release branches |
|
Date: |
Sat, 12 Jul 2014 10:19:12 -0400 |
On Sat, 2014-07-12 at 11:31 +0200, Torsten wrote:
> Of course Pantxo's patch can be merged into gui-release but I am
> wondering whether it is in general necessary/helpful to merge changesets
> from the default branch back into the gui branch if these changesets
> affect files with ongoing work for the gui release (like cset
> 6113e0c6920b)?
Btw, a bit of terminology: branches are merged, not individual
patches. Please don't merge default into gui-release. If you need to
backport patches from default to gui-release, graft them. This will
bring up a merge tool for resolving conflicts.
- Jordi G. H.