AWESOME way to resolve Git merge conflicts
In a large software engineering team, git merge conflicts are almost unavoidable. You can’t really keep merge conflicts from arising. What you can control is how you resolve them.
In a large software engineering team, git merge conflicts are almost unavoidable. You can’t really keep merge conflicts from arising. What you can control is how you resolve them.
If anything happens between now and tomorrow morning (lost/stolen laptop, hard drive crashes, virus/malware, …) you don’t lose your work.
“Can’t you just cut and paste it? It’s not that complicated…”
Programmers/developers often hear this from management and other teams.
I get that all the time, too.
Yes, it’s annoying 🙂