Git's magic to resolve common issues with active repositories

May 17, 2021 · 5 min read · Whenever I start developing a new feature, I do a git fetch and git rebase origin/main to make my local main upto date with the remote main. Then I create a new branch using git checkout -b <NEW_BRANCH_NAME> But when working on repositories with act...