Open supersonic1999 opened 3 years ago
I think to avoid the merge conflicts, you will need to set upstream the repo:
git remote add upstream git@github.com:dpalmasan/TRUNAJOD2.0.git
Then to fetch the commits (and branches) from the "upstream":
git fetch upstream
Then probably pulling changes in your local master branch: git pull
. And your branch devissue-28
might need to be rebased from master git rebase master
I think to avoid the merge conflicts, you will need to set upstream the repo:
git remote add upstream git@github.com:dpalmasan/TRUNAJOD2.0.git
Then to fetch the commits (and branches) from the "upstream":
git fetch upstream
Then probably pulling changes in your local master branch:
git pull
. And your branchdevissue-28
might need to be rebased from mastergit rebase master
Thanks for the info!
28