github fork master branch merge / refresh hack
would the following work ? i think i need to read these first
- https://dev.to/datreeio/10-insanely-useful-git-commands-you-wish-existed-and-their-alternatives-8e6
- https://github.com/brianamarie/10-git-problems/tree/master/05-merge-two-repos
CLONE YOUR FORK
$ git clone git@github.com:osde8info/symless-synergy-core.git
$ cd symless-synergy-core
$ git remote add upstream https://github.com/symless/synergy-core.git
$ git fetch upstream
MERGE
$ git merge upstream/master
FIX or DELETE any conflicts
$ git rm CONFLICTINGFILES
$ git commit -m 'deleted all conflicts'
MERGE AGAIN
$ git merge upstream/master
PUSH YOUR FORK
$ git push origin master
adapted from
https://dev.to/rrampage/git-how-to-keep-your-fork-updated-with-remote-repository-1g4i
Top comments (0)