Going to: Resolve > Resolve Conflict ...tends not to actually clean up the mine/theirs in code and instead just marks a file as resolved so you may check it back into source control without source control complaining. Be careful with this.
No comments:
Post a Comment