I am Joseph Rex,
voyaging the boundaries of interfaces and interactions

Joseph is a software engineer at ConvertKit, a creative technologist that loves combining art and engineering, and dad to an over-demanding australian shepherd named Glitch.

Dealing with merge conflicts

Recently, I started using git and mercury for version control. I’ve never really used any other version control system before these two. For most of my recent projects, I’ve chosen to make more use of git. Git is a really awesome version control system as I’ve heard from a lot of Pros coming from other version control system like Subversion (SVN).

Articles on X-Team Articles on Infosec Institute