[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Thu, 14 Jun 2001 10:52:43 -0400
> Alex Flores wrote:
> Can somebody give me advice on how to resolve merging conflicts using
> CVS120 with a 1.2 patch.
Do you mean WinCVS 1.2? CVS is only at 1.11.x
> The only difference between the main trunk
> and the branch is some comments that I added. I tried to resolve the
> conflict by deleting the comments on both the main and the branch but
> I still get a conflict.
> Alex Flores
You should only edit the working copy (the one with conflict markers in
- Merging, Alex Flores, 2001/06/14
- Re: Merging,
Matthew Riechers <=