Johan Hake <[email protected]> writes: > @Jed: > What would happen with merges that are just fast forward, with no merge > commit generated?
Merge with --no-ff. In our workflow, there is usually plenty of parallelism and branches (are supposed to) be integrated in 'next' before merging to 'master', so a merge could almost never fast-forward anyway. > It also looks like: > > git log --first-parent > a788fefb92ba6f13335382d2c6d4c7aab56c9202..9b6f779ec7f3cf9d84e49258febbe4ad75d5d4bf > > includes a lot of non merge commits. Yeah, you can't use it for this release, but with a small tweak to the workflow, you can make it work and not have merge conflicts on the ChangeLog file. (The more parallelism you have in development and integration, the more likely conflicts are to arise. They're not hard to resolve, but it's a manual process.)
pgpJFnh8DpY5u.pgp
Description: PGP signature
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
