Hey Andrew, Open up the file you wanted to commit and edit it so it looks ok again (it should have both your and the new head version edits surrounded by edit marks). Then in Versions right click the file and select "Mark as Resolved".
Good luck, Koen On Feb 2, 8:55 am, Andrew <[email protected]> wrote: > Ok, > So we've had our first development conflict... (generated .mine, .rxx > files etc..) > > what's next for resolving this? -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
