Hacker News new | ask | show | jobs
by justushamalaine 2791 days ago
There is this fun way of not nuking others changes in the remote `git push --force-with-lease`.

This pushes your commits if you already know all commits that are in the branch in the remote. Of course this still leaves the problem that others will have merge conflicts when they pull from the remote.

Rebasing is powerful tool and it really provides great benefits.

Especially before your merge your branch to master. It is lot cleaner if someone cleans the branch history so that commits are combined to clean nice commits, before it is merged to master.

Personally I am annoyed about `fix typo in last commit` commits merged to master.