@steveklabnik.com on JJ's approach to handling conflicts: "JJ allows commits to stay in a conflicted state. It's chill with that happening." @steveklabnik.com explains why this is important for developers working on multiple branches simultaneously. #OpenSource #Git fallthrough.fm/ep/70

8 likes 1 replies