resolver conflicto de combinación git visual studio 2019 ejemplo de código

Al fin luego de tanto luchar pudimos dar con el resultado de esta cuestión que tantos lectores de nuestro espacio presentan. Si quieres aportar algo puedes dejar tu comentario.

Ejemplo: cómo resolver conflictos en git

This is very question because I am facing
withthis issue all the time. Basically
conflict arises when more than one commit 
that has to be merged with some change in the
same place or same line of code. In thiscase
git will not be able to predict which change
to take. So my approach to fix this issue,I would stash my project to temporary memory 
and pull the project from github to working 
directory.I would fix the confict and
merge the project and than I would add,
commit and push it the updated version.


git stash        --> take my project to temp memory
git pull         --> pull the project from GitHub to working directory(my computer)
git stash pop    --> take my project to my working directory,     
					fix the conflict and merge the project.
git add .
git commit –m “comment”
git push

Más adelante puedes encontrar las explicaciones de otros programadores, tú incluso puedes insertar el tuyo si lo deseas.

---

---

Utiliza Nuestro Buscador