When resolving conflicts PushOk leaves the Conflict markers

( CVSSCC , VS .NET, 2.0.x, WIN 2000/XP, CVS NT 2.x >= 2.0.58 )

Type: Public Status:Closed Created: 05 May 06 05:00 Updated: 10 May 06 05:00

--> Igor Pushkov (admin) at 10 May 06 05:00 writes

Some followup... It is update help for new version of plug-in and you will
be able to find explanation about options on mentioned configuration page.
In brief plug-in now can use all possible type of tools: which not require
conflicts markers and those that require them. Plug-in can recreate
conflict markers on the fly, while by default files does not have them.
This now controlled by specific option.

--> Oleg Akolupin (admin) at 06 May 06 05:00 writes

You can adjust all it in VS.NET's menu "Tools/Options/Source Control/SCC
Provider/Advanced.../CVS executables".

--> Daniel Pupek (user) at 05 May 06 05:00 writes

I would like to see PushOk handle Conflict Resolution the same way that
TortoiseCVS does. PushOk should open up the version on the server and the
version in your sandbox (like Tortoise) instead of using the conflict file
produced by CVS. The conflict file produced by CVS adds addtional markers
that IMHO make it harder to resolve conflicts between two versions of a
file when using a diff program (like WinMerge).

The conflict file is meant for resolving conflicts without a differencing
program.

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

When resolving conflicts PushOk leaves the Conflict markers