Git tutorial #22 - Git merge - conflict
Hello everyone, I hope you are well! 🤓 😎
In this post we will talk about something very common when we merge between branches and are conflicts between files.
Basically we can get a conflict by mixing two branches when we have modified the same files and the same lines of our project, in this case git does not know what to do then in this case we must resolve the conflict, and we must choose which changes to leave and which to delete depending on the file or files that present the conflicts, once this is done, what we do is a new commit and then we perform the new merge between branches.
Well that's all for this post, see you later!
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.