Git tutorial #20 - Git merge
Hello everyone i hope you are very well! 🤓 😎
In this post we will explain the mixture of branches for our project.
In this material we will concentrate on mixing branches and resolving conflicts. The first thing I have to do to mix branches is to stand on the branch I want to mix.
To mix the changes we should use the git merge command. The instructions would be to stop us from the branch that we want to mix and make a git merge with the branch that we intend to use.
$ git merge responsive
In this case what we will do is to mix the responsive branch with the master branch master and thus we will have a single line of time in which our changes will already be.
Well it's all for this post.
Regards!🤓 😎
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?
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.