Comment Comment by jklein11 To me this feels like making a commit without unit testing first. When I find a conflict I like to be able to resolve it and then do some unit testing to make sure that my revision didn't miss anything. parent jklein11 10 years ago