Stream: committers
Topic: conflicts
Lloyd McKenzie (May 12 2016 at 02:38):
I keep getting conflicts on vscache/validation.cache/not-supported.txt when I update
Grahame Grieve (May 12 2016 at 02:49):
just 'accept theirs'
Lloyd McKenzie (May 12 2016 at 02:51):
I do. But it would be nice if I didn't keep getting conflict messages
Grahame Grieve (May 12 2016 at 02:53):
does this happen to anyone else?
Grahame Grieve (May 12 2016 at 02:53):
can you take a copy of the file before you overwrite it, and send it to me?
Lloyd McKenzie (May 12 2016 at 03:03):
I will once I get my local build to work :)
Igor Sirkovich (May 12 2016 at 18:02):
I got the same conflict on vscache/validation.cache/not-supported.txt as Lloyd did after running "svn up" and had to 'accept theirs'
Last updated: Apr 12 2022 at 19:14 UTC
