mkdir ~/repos
cd repos
git clone git@github.com:karlosmid/repo_name.git
cd repo_name
git status
git checkout master
git pull --rebase
git branch -a
List of all repo branches, remote and localgit checkout -b feature_name
Creates feature branch with name feature_name from master branchgit status
git push -u origin feature_name
put feature branch to remote repogit checkout feature_name
To be sure that you are in appropriate feature branch.git add .
git commit -m 'something useful and funny'
git rebase -i @{u}
git push -u origin feature_name
git checkout master
git merge --no-ff feature_name
grep -H -r '<<<<<<< HEAD' * | less
-check for conflicts. Resolve them using your favourite editorgit commit -m 'merge from to'
git rebase -i @{u}
git push -u origin master
git push origin :feature_name
git branch -d feature_name
Labels: software development