Error 192 Conflicts or changes in the working copy prevented update

Asked By Olivia Aust 10 points N/A Posted on - 10/11/2012

I have this error which happened after I tried to do a few simple merges.

> vv diff

(Empty response; I assume that the working copy is clean)

> vv branch

cm2 (This is a branch I've just successfully committed a merge to)

> vv update -b b

vv.exe: Error 192 (sglib): Conflicts or changes in the working directory prevented UPDATE:

There are uncommitted changes in the working directory and the goal change set is not a descendant or ancestor of the current baseline.

How do I prevent this from happening?

 

Working

Error 192 (sglib): Conflicts or change in the working co…

• Status: Open
• Question Views: 563
• Answer Count: 1
• Vote Up 0 Vote Down

• Answer Accepted: No
• Question Category: Software Others

Answered By Nicke Baker 0 points N/A #191978

Error 192 Conflicts or changes in the working copy prevented update

Hello Olivia,

That could be a compiler trash or it may be very huge binary asset that you need to be present in the tree, but that it will not be good for you to commit. So it is not  safe for you to blindly delete the file. It is possible that the code is  being a little too protective, and therefore you might want to allow it if the parent directory is also found/ignored.

Regards,

Nicke

About Nicke Baker

Questions
0

Answers
671

Best Answers
100

• Vote Up 0 Vote Down

• Posted on - 10/11/2012
• Question Category: Software Others