Übersetzung für "Konflikt auflösen" in Englisch

You have to resolve the conflict first.

You must resolve this conflict before committing your changes to the repository.

You must resolve this conflict before committing your changes to the repository.

What I suggest - something which has been taken on board by the Research Committee - is that we should resolve this conflict, and, moreover, in a positive way by, in the course of the next few years, creating from this Research Fund a Research Foundation which would develop alongside the research framework programme. Funds could be paid into it by Member States, but also from private sources - it is above all the private sources I am thinking of - in order to finance research projects other than into coal and steel.

Now that the changes you originally made to bar.c have been successfully reproduced in baz.c, you can delete bar.c and resolve the conflict, instructing the resolution logic to accept what is currently in the working copy as the desired result.

If you've postponed a conflict, you need to resolve the conflict before Subversion will allow you to commit your changes.

If you postpone a conflict from the first wave of changes, the whole merge command will bail out with an error message and you must resolve the conflict before running the merge a second time to get the remainder of the changes.

You have to edit the file manually and resolve the conflict before you can commit any further changes.

An external merge program used to resolve conflicted files.

Starts the merge editor so you can resolve the conflicts manually.

Tolerance can diffuse potential conflicts.

See the section called “Resolve Conflicts (Merging Others' Changes)” for an in-depth look at resolving conflicts.

There are parts of a story: setup, conflict, climax and resolution.

File Resolve...

Resolve conflicted files by preserving all local modifications and discarding all changes fetched from the server during the operation which caused the conflict.

After performing the merge, you might also need to resolve some conflicts—just as you do with svn update —or possibly make some small edits to get things working properly.

In the section called “Resolve Conflicts (Merging Others' Changes)”, we saw that an update produces files named filename.mine, filename.rOLDREV, and filename.rNEWREV.

If its value is yes (which is the default value), Subversion will prompt the user for how to handle conflicts in the manner demonstrated in the section called "Resolve Conflicts (Merging Others' Changes)" .

Subversion 1.5 introduces interactive resolution of conflicts (described in the section called "Resolve Conflicts (Merging Others' Changes)"), and one of the options provided to users is the ability to launch a third-party merge tool.

Option: Conflict Resolution: Rename Losing File, Not Delete If Automatically Resolve Conflicts option is enabled then do not delete file that loses as a result of conflict resolution.

Subversion 1.5 introduces interactive resolution of conflicts (described in the section called “Resolve Conflicts (Merging Others' Changes)”), and one of the options provided to users is the ability to launch a third-party merge tool.

In the section called "Resolve Conflicts (Merging Others' Changes)", we saw that an update produces files named filename.mine, filename.rOLDREV, and filename.rNEWREV .

After performing the merge, you might also need to resolve some conflicts (just as you do with svn update) or possibly make some small edits to get things working properly.