View Single Post
Thanks. And is there a rule of thumb as to which file is labeled "conflict" and which one isn't?