Archive for July, 2020

So you clone your branch from master, do some changes (i.e commits into your branch ), and meanwhile other folks did the same and their PR went to master, so your branch with your changes now really might have conflicts with current master – so what to do ? One of quickest options here is to save your changes somewhere outside your working folder and force to update your branch to latest master and then do changes on top of that and commit them into your branch and do PR which do not have merge conflicts. So you should be inside your branch (with name abokov_branch ) folder

1) git checkout master
2) git branch -D abokov_branch
3) git checkout -b abokov_branch
4) (make changes - remember you saved them somehwere)
5) git commit -am "your message here"
6) git push --set-upstream origin abokov_branch -f