News for hackers. Stuff that matters.
Re:GitFlow considered harmful by Joeri on Friday June 19, 2015 @12:53PM (#9746075)
My two cents is that i haven't found it difficult to merge between branches myself. I'll open up a diff view of the commit(s) i want to merge, and then merge them branch-to-branch and file-to-file using a two-way merge tool, using the diff as a guide.

There are no comments on this comment yet.