5 ms·
This doesn't affect anyone else! Other than they don't see noisy, meaningless merge commits. It only takes effect when you are both behind AND ahead of the rem
by gregmac 4y ago
This doesn't affect anyone else! Other than they don't see noisy, meaningless merge commits.
It only takes effect when you are both behind AND ahead of the remote (as in: you have local unpushed commits, and there are remote commits you don't have).
It pulls the remote commits first, then rebases your commits using those as a base.
You are left with a repository where you are ahead of remote, and can just push your commits normally.
Only your local history is affected (insofar as your hashes will change).
- Nullabillity 4y agoNo, you're now pushing up a history that is a lie. Those commits represent states that never existed, and which you never tested. They certainly don't represent your headspace at the time. Those merge commits are the truth. The histories diverged, and had to be reconciled at some point. If I'm trying to understand the history then I want to see that, not your idealized version where you try to pretend that the divergence never happened. It can be hard to accept sometimes, but you're putting in a lot of effort for an end result that just makes life worse for everyone involved.