-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 16.09.2014 10:44, roger peppe wrote:
> As far as I can make out, as long as you want to propose your > branch with only a single commit added to the log, this makes it > easy to use a merge-based flow and amounts to the same thing in the > end. > > I use it a lot, and it's saved no end of "this is the *third* time > I've resolved these conflicts" pain. > Yes, using the merge workflow you quite often have to deal with resolving the same conflicts each time. And at the end you have a bunch of merge changesets, which is not very helpful for following the commit log later. Just two reasons I'm using the rebase workflow, each time I fetch master, I do an interactive rebase and usually leave only one commit (folding the others in it). One more thought re "rebase considered evil/impolite" - I only do that in my own branches, which is not a problem (even after the initial push, I still rebase, despite the branch going "public"). I guess this won't work well if you have to collaborate with other people on the same branch, but this is by far less common scenario. Cheers, - -- Dimiter Naydenov <[email protected]> juju-core team -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJUF+3+AAoJENzxV2TbLzHwLwEH/0VhdicdszrULpWma00mIYB0 G5xZnDEEXsB2Ud1EBhvLm84OIQeIfpuL/osbPEeb9xR1w8856Gll36nbNr8wuQle S+Wq/Gj3VT5jYo7TthUem6qG415/FLa9erPYmCXbyNynXHdBUA5Y8eTbRCZSUC0a kEdUot/vs5aPlZnFgvrxPtKZ2J7D37BslhZZujKQrDeMEoQHtZ9fgYKHDJovE3Yn 9TGcqX+d8mYxQrOD1GkBxcjEbt919ti3s3cqZDTzi/7zeGgXfCjMGoG4gEuPX5Jv O1IHjIqYxJRx0K5qkGimKtIMYe15WOEA4dCkd9p6pdLMh690lqwYwdp1MqVYlEo= =RS8e -----END PGP SIGNATURE----- -- Juju-dev mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/juju-dev
