Download as pdf or txt
Download as pdf or txt
You are on page 1of 1

Create new branch

for changes : Make


git clone [F-URL]
START git branch changes in
git remote add upstream [O-URL]
[BRANCH-NAME] project

Make
changes in
git add .
project to
git commit -m "[MESSAGE]"
resolve
conflicts

open remote repo.


Push changes to remote origin
and compare
git push OR new PR ? Yes
changes & make
git push origin [BRANCH-NAME]
pull request

review faults No
and discuss
No
what went
wrong

git fetch upstream PR


Yes conflicts ? No
Merged ?
git merge upstream/main

Option Yes

delete f-branch & update local repo


merge: f-branch - main branch : with upstream :
git checkout main git branch -d [BRANCH-NAME]
git merge [BRANCH-NAME] git fetch upstream
git checkout main
git merge upstream/main

Push changes
to remote origin
git push

END

You might also like