4 ms·
I use it when cleaning up pull requests. Rebase and squash. Fix commit messages. Force push to PR-branch tidy.
by nickstinemates 13y ago
I use it when cleaning up pull requests.
Rebase and squash. Fix commit messages. Force push to PR-branch tidy.
- phaemon 13y agoWhy would you do this, rather than pull into a different branch name, fix it there, and then merge it in? Is there an advantage to doing it by altering your own repo?
- nickstinemates 13y agoI am talking about editing history and squashing commits. For cleaner merges.
- gcb1 13y agoBut you should do that locally and then push without force.
- swift 13y agoIf you're working in an organization that employs pre-merge code review, you may have to modify your topic branch several times before it's ready to be merged into the main development branch. Creating a new branch every time so that you can push without force seems pointless in this case and increases confusion for everyone involved in the process.
- lmm 13y agoYes, but you can pull into a new local branch, do the history edit there, and then push that new branch, can't you? Not that I'm sure it would be worth it.