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.

If you get Fatal: Not possible to fast-forward, aborting GIT pull error, follow the solutions mentioned below to resolve the issue. Pull the rebase Merge the changes from the master branch into a new ...

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 ...

Kaleidoscope, the popular file comparison and merge tool, recently released an update with significant improvements to its merge conflict resolution tools. The new version introduces new features and ...