Last active
February 22, 2021 21:55
-
-
Save techsolx/bb667cb1f3f295112439d82ff4914902 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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