Git

Adding an existing project to remote repo

git init
git add .
git commit -m 'First commit'
git remote add origin remote repository URL
git remote -v
git pull origin master
git push origin master

Create a branch from another branch

git checkout -b myFeature develop

Delete branch locally and remotely

git branch -D <branch-name>
git push origin --delete <branch-name>
git remote prune origin

Delete multiple branches which contains keyword sh

git branch | grep 'sh' | xargs git branch -d

Discard untracked files

git checkout -- .
git clean -f
git reset --hard

Get-checkout remote Git branch

git fetch
git checkout <branch-name>

ignore files with .gitignore

// Add files and folders to .gitignore
git commit -m ".gitignore is now working"

git rm -r --cached . // or
git rm --cached filename

git add .

merge a git branch into master

git checkout master
git pull origin master
git merge test
git push origin master

Push a specific branch to the remote

git push origin <branch-name>

Remove commits

// remove all commits until HEAD/Last merge
git reset --hard HEAD~1
// remove specific commit
git reset --hard <sha1-commit-id>
// push removed commits to remote branch
git push origin HEAD --force

Resolve conflicts

git checkout master
git pull origin master
git merge sh-develop
git diff --name-only --diff-filter=U