> Le 7 janv. 2015 à 05:57, Stefan Bodewig <bode...@apache.org> a écrit : > > On 2015-01-07, Nicolas Lalevée wrote: > >> For instance, to get commits from one branch to the other, I have seen >> two ways: via merge or via cherry-pick. >> Since our branches are meant to diverge à some point, I think using >> cherry-pick should be used, right ? > > Alternatively develop the feature on a third branch, merge that branch > into both others and delete the feature branc afterwards.
Yep, that is a great feature of git too. > >> And about merging pull request, there is the direct pull, for instance: >> git pull https://github.com/jbaruch/ant-ivy >> <https://github.com/jbaruch/ant-ivy> patch-1 > >> And there is the rebase way, exemple: > > The approach I've seen taken a lot on github is to have the submitter of > the pull request rebase (and squash) the PR before you merge it. > Squashing means you juts get a single clean commit rather than a > sequence of refinements. Ok. I find it strange that there is not a simpler way to do it from the merger point of view. Nicolas --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
