Community driven content discussing all aspects of software development from DevOps to design patterns. When your git commit history gets long in the tooth, and you want to clean up your feature and ...

We've got two primary development branches, master and migration (we're migrating our processes to use/support PostgreSQL away from Oracle.) We're slowly working through our processes/modules ...

Sublime HQ – the folks behind the excellent text editor Sublime Text – has released a code editor for developers that focuses on a clean interface for coding and solving git merges. It’s called ...

GitHub today announced a major update to its visual Git client, GitHub Desktop. Version 1.5 introduces a new way to resolve merge conflicts, which are inevitable when working on a project with a team.