Useful snippets

    Accept your changes - rebase merge conflicts

    git tag branch_before_rebase
git rebase -X theirs develop
    • Manually compare current branch with branch_before_rebase
    • Correct whatever needs to be corrected