Menu
I recently tried to do an svn up and got the following:
Conflict discovered in 'myapp/protected/config/myapp/mode_staging.php'
I was given a number of options and I (probably the wrong choice now) choose to [p] Postone.
Now when I try to run the svn up I get the following message everytime (plus the site itself has a white screen of death)
Skipped 'myapp/protected/config/myapp/mode_staging.php
At revision xxx.
Summary of conflicts:
Skipped paths: 1
Clearly the mode_staging.php is the problem - what is the best/easiest way to resolves this?
357
Step 1: View Conflicts Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: Subversion is complaining that there is a conflict with the README file, and Subversion does not know how to solve this. So Jerry chooses the df option to review the conflict.
To resolve a conflict do one of three things: Merge the conflicted text by hand (by examining and editing the conflict markers within the file). Copy one of the temporary files on top of the working file. Run svn revert FILENAME to throw away all of the local changes.
When you merge your branch back into the trunk, SVN tries to do the same again: It sees that a file was created in your branch, and tries to create it in your trunk in the merge commit, but it already exists! This creates a tree conflict. The way to avoid this, is to do a special merge, a reintegration.
Some uncommitted changes you have in mode_staging.php in your working copy conflict with incoming changes from the repository (which you get when running svn update). By choosing option [P], you've instructed the client to postpone conflict resolution so the file mode_staging.php has C (Conflicted) status in your working copy. You must resolve the conflict to solve the issue. For example, you can resolve the conflict by discarding changes you performed locally (i.e. by accepting changes from the repository). In such case you should run svn resolve --accept=theirs-full against the conflicted file.
See "SVNBook | Resolve Any Conflicts" for more information.
151
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
