git take ours
git pull -X theirs
Also in Shell:
- install tensorflow
- seti for ubuntu
- show output after a keyword in shell script in a file
- branch list in git
- list changed files git
- driver hosts file
- run python program from command line
- which desktop environment is runnings
- last_ack
- repo from bitbucket to github
- git how to delete origin branch
- linux check cpu core
- how to make file in terminal ubuntu
- how to check date is older than x days in shell script
- how to tar linux
- special bash variables
- date linux show millis
- kill process in windows powershell
- how to pip install in folder
- ubuntu list running applications
- how to install mongoose
- start a local SMTP debugging server in linux
- git amend
- pipe + exec duplicate stdout linux