Discussion on: How to Prevent Merge Conflicts (or at least have less of them)

Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.

Confirm