Timeline for Why do so many projects prefer "git rebase" over "git merge"?
Current License: CC BY-SA 3.0
2 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Sep 20, 2018 at 8:26 | comment | added | Bruno Schäpper |
Sure :-) In git flow, we regularly create new release branches. If after creation, a bug is fixed in development branch, we use git cherry-pick -x <commit> to apply it to the release branch. Or, we might want to undo something for the release, with git revert <commit>. If <commit> is a merge, it gets hairy. It is possible as far as i know, but not easy to do. When using rebase, every 'merge' is one giant but regular commit, easily cherr-pickable and revertable.
|
|
| Jan 28, 2018 at 17:07 | history | answered | Bruno Schäpper | CC BY-SA 3.0 |