Rebase is the only clean way forward for small projects in which people step on each others toes.
Merge commits are difficult to comprehend for some developers, leading to errors. Avoiding them is beneficial. On Mon, Jan 16, 2017 at 8:23 PM, Hervé BOUTEMY <[email protected]> wrote: > do we want to keep such merge commits? > > I would have expected that when merging, we rebase then have no such merge > commit: that branch work is just a temporary situation that completely > disappears once merged (and we must not forget to delete merged branch) > > what do others think? > > Regards, > > Hervé > > Le lundi 16 janvier 2017, 02:17:26 CET [email protected] a écrit : > > Merge branch 'MNG-5629' > > > > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c6c5192d > > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c6c5192d > > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c6c5192d > > > > Branch: refs/heads/master > > Commit: c6c5192d4bcb50c1aab6fade53dfb9c2f3d9b7e7 > > Parents: a83296d ca1179c > > Author: Christian Schulte <[email protected]> > > Authored: Mon Jan 16 03:16:49 2017 +0100 > > Committer: Christian Schulte <[email protected]> > > Committed: Mon Jan 16 03:16:49 2017 +0100 > > > > ---------------------------------------------------------------------- > > .../legacy/DefaultUpdateCheckManager.java | 61 > ++++++++------------ > > 1 file changed, 24 insertions(+), 37 deletions(-) > > ---------------------------------------------------------------------- > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
