zhiren Posted June 14, 2012 Group: Members Topic Count: 3 Topics Per Day: 0.00 Content Count: 9 Reputation: 0 Joined: 01/31/12 Last Seen: January 4, 2013 Share Posted June 14, 2012 Hi, I have some src edits in my server, everytime I try to update the SVN it says: Conflict discovered in <filename>. Is there any way to update? Quote Link to comment Share on other sites More sharing options...
java Posted June 14, 2012 Group: Members Topic Count: 27 Topics Per Day: 0.01 Content Count: 265 Reputation: 35 Joined: 12/22/11 Last Seen: 5 hours ago Share Posted June 14, 2012 put ur screen shoot or code error here , nobody want help you if u no showing ur error Quote Link to comment Share on other sites More sharing options...
Question
zhiren
Hi,
I have some src edits in my server, everytime I try to update the SVN it says: Conflict discovered in <filename>. Is there any way to update?
Link to comment
Share on other sites
1 answer to this question
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.