Show the diff(erence) between two files [free GUI client]

When working with code, especially with front end code, you might want to see a diff of two files. Maybe you have a build tool that’s doing something with it or just two different versions. The point is: You want to know exactly if two files are the same or just have all the differences listed. I’ll just share some of my favourite tools for that.

Continue reading “Show the diff(erence) between two files [free GUI client]”

How to: Create a git Merge Conflict

Creating a git merge conflict is easier than you think. It usually naturally occurs when git doesn’t know which change to accept into a branch, while merging. Typically you want to avoid them, but for educational purposes or just to get a better understanding of them, let’s create a git merge conflict.

Continue reading “How to: Create a git Merge Conflict”