Curso Git #20 - Git merge

in #spanish7 years ago (edited)

Hola a todos espero que se encuentren muy bien! 🤓 😎

En este post explicaremos la mezcla de ramas para nuestro proyecto.

En este material nos vamos a concentrar en mezclar ramas y resolver conflictos. Lo primero que tengo que hacer para mezclar ramas es pararme sobre la rama que quiero mezclar.
Para mezclar los cambios deberíamos usar el comando git merge. Las instrucciones sería pararnos desde la rama que queremos mezclar y hacer un git merge con la rama que pretendemos usar.

$ git merge responsive

En este caso lo que haremos es mezclar la rama responsive con la rama principal master y así tendremos una sola línea del tiempo en el que ya estarán nuestros cambios.

Bueno es todo por este post.

Saludos!🤓 😎

Sort:  

This post has been ranked within the top 10 most undervalued posts in the first half of Oct 21. We estimate that this post is undervalued by $77.36 as compared to a scenario in which every voter had an equal say.

See the full rankings and details in The Daily Tribune: Oct 21 - Part I. You can also read about some of our methodology, data analysis and technical details in our initial post.

If you are the author and would prefer not to receive these comments, simply reply "Stop" to this comment.

Hola Sigue así!
Ya te sigo ! Sígueme para Curiosidades Impresionantes!:)

Este Post ha recibido un Upvote desde la cuenta del King: @dineroconopcion, El cual es un Grupo de Soporte mantenido por 5 personas mas que quieren ayudarte a llegar hacer un Top Autor En Steemit sin tener que invertir en Steem Power. Te Gustaria Ser Parte De Este Projecto?

This Post has been Upvote from the King's Account: @dineroconopcion, It's a Support Group by 5 other people that want to help you be a Top Steemit Author without having to invest into Steem Power. Would You Like To Be Part of this Project?

This post has received a 0.52 % upvote from @drotto thanks to: @banjo.

Congratulations! This post has been upvoted from the communal account, @minnowsupport, by juanpchica from the Minnow Support Project. It's a witness project run by aggroed, ausbitbank, teamsteem, theprophet0, someguy123, neoxian, followbtcnews/crimsonclad, and netuoso. The goal is to help Steemit grow by supporting Minnows and creating a social network. Please find us in the Peace, Abundance, and Liberty Network (PALnet) Discord Channel. It's a completely public and open space to all members of the Steemit community who voluntarily choose to be there.

Coin Marketplace

STEEM 0.17
TRX 0.12
JST 0.027
BTC 55499.23
ETH 2917.22
USDT 1.00
SBD 2.30