Quantcast
Channel: SCN: Message List
Viewing all articles
Browse latest Browse all 3347

Re: Checked out, conflicting errror

$
0
0

Hi,

That means that your file is already updated in the repository and you're holding an older version but happened to change it. I fyou want to pick and choose the differences just click with the right button on your file then Team -> Merge tool.

There are other quicker options as well (Team -> Resolve with -> Remote/Local).

 

BRs,

Lucas de Oliveira


Viewing all articles
Browse latest Browse all 3347

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>