Posts

Showing posts with the label git-flow

What's the best practice for amending a merged remote branch?

Image
Clash Royale CLAN TAG #URR8PPP What's the best practice for amending a merged remote branch? For example, I've finished a feature branch, pushed and merged it into the remote develop branch. After 3 days, I find a typo on that branch, then what's the best way to amend that branch. Create a new branch to correct that trivial mistake or re-work on the old branch? Could you please give an example with git commands for this? Thanks! 1 Answer 1 If I understand correctly, you're talking about a policy issue, not really a technical one. The technical part is the same - you'd treat it as any other change. Another branch to be merged in, if that is your workflow. Whether or not you're committing that new typo on a new branch or the just-merged old branch doesn't matter to git, the tree looks the same in both cases. Here's how it would look like after the merging of your mino...