I decided to share the recipe I always use for solving conflicts in Git, and the version of the blog post in English is live right now!
So if you'd like to understand more about git conflicts and how to solve them you should definitely check it out 👇👇
https://jtemporal.com/solving-conflicts/
So if you'd like to understand more about git conflicts and how to solve them you should definitely check it out 👇👇
https://jtemporal.com/solving-conflicts/