Saisho Posted February 28, 2013 Group: Members Topic Count: 52 Topics Per Day: 0.01 Content Count: 185 Reputation: 20 Joined: 01/06/13 Last Seen: November 11, 2018 Share Posted February 28, 2013 Quote Link to comment Share on other sites More sharing options...
michaelsoftman Posted February 28, 2013 Group: Members Topic Count: 48 Topics Per Day: 0.01 Content Count: 410 Reputation: 29 Joined: 04/04/12 Last Seen: August 5, 2021 Share Posted February 28, 2013 That looks like code leftover from a tortoiseSVN patch. Did you patch it manually or something? Quote Link to comment Share on other sites More sharing options...
Cydh Posted February 28, 2013 Group: Developer Topic Count: 153 Topics Per Day: 0.04 Content Count: 2285 Reputation: 745 Joined: 06/16/12 Last Seen: June 30, 2023 Share Posted February 28, 2013 when you update your svn, you got conflicts, you must edit that conflict first.. Quote Link to comment Share on other sites More sharing options...
Lighta Posted March 6, 2013 Group: Members Topic Count: 16 Topics Per Day: 0.00 Content Count: 737 Reputation: 216 Joined: 11/29/11 Last Seen: December 20, 2020 Share Posted March 6, 2013 delete following line :<<<<<<< mineint inf2;======== >>>>> r17165if you did well you should just have (for all that section).uint32 inf2;This line that I told you to remove are added when you have a conflict on svn, (mean you locally changed a line that was change in latest svn revision, so he's asking you wich version yo choose your's or svn one ? that what is a conflict)We solve it manually here but you could use resolve conflict and choose wich block to take to fix it to. <<<<< mine to ====== mean that all lines between those markers are yours.from ======== to >>>> r17165 all those line was changed on revision r17165 from the svn you foloowing Quote Link to comment Share on other sites More sharing options...
Question
Saisho
Link to comment
Share on other sites
3 answers 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.