b0rk, 3 months ago (edited 3 months ago) poll: when you have a merge conflict, how do you prefer to handle it?
poll: when you have a merge conflict, how do you prefer to handle it?