Git

Clean merge into master branch

1
2
3
4
5
6

git checkout master
git pull 
git checkout dev
git merge master
git checkout master
git merge dev

Keep Fork up to date

1
2
3
4
5

git remote add upstream URL_TO_ORIGINAL_REPO
git fetch upstream // this will create new branches like upstream/master
git checkout BRANCH
git merge upstream/BRANCH
git push -u origin master // to update your remote forked repository

Removing a file from the local and remote repository

Removing a branch from the local and remote repository

1
2

git branch -D BRANCH
git push -u origin master --delete

Python

JavaScript