I have decided to stick with love. Hate is too great a burden to bear.
- List all the branches : git branch
- Pull the recent changes: git pull
- Create a feature branch : git checkout -b <new branch name> <parent branch name>
- Delete branch local: git branch -d <branch-name> or git branch -D <branch-name>
- Delete branch from remote : git push origin –delete <branch_name>
- See all remote branches: git branch -v -a
- Get conflicted list of files: git diff –name-only –diff-filter=U
- git fetch origin (checkout new remote branch)
- git checkout -t origin/remote-branch
- List all remote branches: git branch -r ()