Skip to content

Instantly share code, notes, and snippets.

@techsolx

techsolx/git merge via cli

Last active February 22, 2021 21:55
Show Gist options
  • Save techsolx/bb667cb1f3f295112439d82ff4914902 to your computer and use it in GitHub Desktop.
Save techsolx/bb667cb1f3f295112439d82ff4914902 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git merge via cli
Fetch and checkout branches
git fetch git@<url>:<repo>.git <branch>
git checkout -b <repo>/<branch> FETCH_HEAD
Review the changes in vim https://github.com/tpope/vim-fugitive
Then merge and fix conflicts
git fetch upstream
git checkout upstream/main
git merge --no-ff <repo>/<branch>
Merge it, if you have permissions to do so
git push upstream master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment