--- tags: git title: gitflow note --- # trivial :::info Q: git merge "main" with directly overwrite the "release" branch A: ```shell= git checkout release git merge -Xtheirs main ``` :::