mkdir /tmp/repo
cd /tmp/repo 
git init
echo "Linea 1" >> prueba.txt
git add prueba.txt
 
git config --global user.email "you@example.com" #Hacerlo solo la primera vez
git config --global user.name "Your Name"  #
git commit -m "Commit inicial"
 
git branch
echo "Linea 1" >> coloso.txt
git add coloso.txt 
git commit -m "agregando coloso en master"
 
git branch test # creando  test
git checkout test # cambiandose al branch test
echo "Linea 2" >> coloso.txt
git add coloso.txt 
git commit -m "agregando coloso en test"
 
 
git checkout master
git merge test
nano coloso.txt #Resolver el conflicto
git add coloso.txt 
git commit -m "Merge test master"
git log 
 
 
git branch -r
git remote add origin git://git.kernel.org/.../gregkh/staging.git
git pull
git push
 
man git-remote

• https://nvie.com/posts/a-successful-git-branching-model/