It seems like a complex issue to me... Though I don't think I quite understand all the issues here.
My feeling is that what default is sensible would probably depend on your workflow (and on personal
preference). I've seen some opinions out there that 'rebase is evil'.
E.g: http://changelog.complete.org/archives/586-rebase-considered-harmful
I'm not expert, but the gist of it seems that issues with rebase arise if you rebase a branch that is shared with other people. It would be fine
to rebase a branch that only exists in your local clone on your own personal machine.
Here's another opionion arguing for use of both rebase and merge depending on what you are doing:
http://gitguru.com/2009/02/03/rebase-v-merge-in-git/
He seems to argue for a workflow doing rebases for 'spin-off branches' and merges to bring in changes back into 'master'. (That incidentally does seem to
Jive with making rebase default for new branches... assuming you won't actually push those branches and share them with anyone else).
Finally, from what I've read here and there (sorry can't find a link right now)... it seems that merge is the best default unless people really understand what they are doing with rebase.
I think it is great to have the option to choose your strategy when you create a new branch, but I'm not so sure that rebase would be the right default for everyone and for every workflow.
Since rebase seems to be considered 'dangerous' and 'harmfull' by some, I
would be a little worried to pick that as a blanket default for any new
branch.
Maybe it makes more sense to choose 'merge' as default. And if you consider yourself an expert, you can then somehow and easily override that to use rebase when appropriate.
Kris
See also 370735: Improvements to the Add
Branch action (https://bugs.eclipse.org/bugs/show_bug.cgi?id=370735)
One of the goals is to choose the pull
strategy for newly created branches. Rebase strategy could be the default.
--
Szymon
From:
John J Barton <johnjbarton@xxxxxxxxxxxxxxx>
To:
Orion developer discussions
<orion-dev@xxxxxxxxxxx>
Date:
2012-02-10 18:45
Subject:
[orion-dev]
git rebase by default
Sent by:
orion-dev-bounces@xxxxxxxxxxx
I sense that git mavens believe that the default workflow
for git
should be rebase rather than merge:
http://d.strelau.net/post/47338904/git-pull-rebase-by-default
If true, then it would be great if Orion can make this default easy to
use.
jjb
_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev
_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev
