$touch file2.txt
$git add .
$git commit " Nuevo file"
$git checkout master //se cambia al branch master
$git merge rama1 // se funciona el file
cesar@sisweb:~/learning-git$ git log
commit dc2c5091a18f0532853ac695cf95cbf99883d2ed
Author: Cesar Morones <cesar.morones1@gmail.com>
Date: Wed Sep 21 09:47:51 2016 -0500
Nuevo file
commit f8948973df81a18d809247e1e0236d5dcd137e9e
Author: Cesar Morones <cesar.morones1@gmail.com>
Date: Wed Sep 21 09:08:17 2016 -0500
primer commit2
No hay comentarios:
Publicar un comentario