On 24/09/13 00:49, Roland Kaufmann wrote:
On 2013-09-23 03:12, Arne Morten Kvarving wrote:
@rolk can push [build system changes] directly, once they have been
reviewed and merged elsewhere
But I won't :-)
(If anyone is interested in how I did the CMake rollups, they can read a
write-up at <http://rolk.github.io/2013/09/23/build-system-sync/>. I
suspect there is an easier way with `git subtree split` though).
On 2013-09-23 13:28, Arne Morten Kvarving wrote:
i prefer squashed pulls. ... iow; mainline should not carry broken
...
during the review process you push fixes as separate commits. they
are reviewed. they are ack'd. then it's squashed up. only then is it
pulled into mainline.
I do have to say that I disagree with this view. I *do* agree that
during review we could add revisions with --fixup to ease the
reviewing and then squash *those* into their respective targets before
merging.
i never meant that we'd squash the entire pull up, sorry if that was the
impression. a pull should, as requested, be split into logic commits. as
long as it doesn't break at any of them. i meant you use fixup to adress
comments on the individual commits.
_______________________________________________
Opm mailing list
[email protected]
http://www.opm-project.org/mailman/listinfo/opm
