Hi John, On 2013-01-31, at 12:26, John Ralls <[email protected]> wrote:
> [...] > If you create a new git branch from trunk and don't make any changes > (remember, backports are the only allowed changes on a release branch), then > of course it will merge cleanly: It won't have any changes, so the merge will > be a no-op. We should still get (mostly) clean merges if we switch to Geert's proposed policy: bugfix on release branch, then merge into trunk. Regards, Yawar _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
