As software engineers, we generally have a strong desire to write clean, maintainable code. We want changes to take as long as they seem they intuitively sho...
Hating git conflicts? Use git's built-in diff3 option to make sense out of it all!
There's an edge case when using diff3 with git that can make conflicts a nightmare to understand. Learn how to understand and resolve these most dreaded conf...