On 23/09/13 13:43, Andreas Lauser wrote:
Hi All,
On Monday 23 September 2013 13:28:40 Arne Morten Kvarving wrote:
On 23/09/13 13:24, Andreas Lauser wrote:
Congratulations! One question: Do you prefer to rebase PRs prior to
merging
(i.e., makeing them fully bisectable) or do you to like to keep the fixup
patches in the commits of the PRs (for easier reviewing)?
bisectability of mainline is the main priority. so i prefer squashed pulls.
the way i see it, the only history of interest is the history that
impact mainline.
okay, I only asked because (in my limited understanding) Atgeirr prefers the
second option. IMHO we should either have the same policy across all modules
or document which module prefers which policy...
agree'd.
whatever happens outside can be maintained in a separate branch should
it ever be useful,
it very seldom is...
iow; mainline should not carry broken commits.
I agree. But I also see the point of easier reviews...
i don't see how this affects reviews. 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.
if you find it tedious, people should learn to use git commit --fixup <hash>
then it's just a rebase and it's autosquashed for you. no manual
intervention.
arnem
_______________________________________________
Opm mailing list
[email protected]
http://www.opm-project.org/mailman/listinfo/opm
