| 1 |
> |
| 2 |
> However, rebasing changes *on* master, before they are pushed, is a good |
| 3 |
> thing, because that kills non-fast-forward merges. |
| 4 |
> |
| 5 |
|
| 6 |
Nontrivial rebases *on* master can be problematic because you're changing |
| 7 |
history. |
| 8 |
|
| 9 |
Imagine you pull some nice commits from a user. Then at some point you will |
| 10 |
have to rebase them before you push them. If this fails and requires manual |
| 11 |
interaction, the original version of the commits is lost (including |
| 12 |
signatures) and errors are not traceable. |
| 13 |
|
| 14 |
With a merge instead any manual intervention is clearly located in the merge |
| 15 |
commit and the authors of each change are uniquely identifiable. |
| 16 |
|
| 17 |
-- |
| 18 |
Andreas K. Huettel |
| 19 |
Gentoo Linux developer (council, kde) |
| 20 |
dilfridge@g.o |
| 21 |
http://www.akhuettel.de/ |
Archives