[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS Merge, No Conflict

From: Jim Hyslop
Subject: Re: CVS Merge, No Conflict
Date: Fri, 02 Sep 2005 11:26:19 -0400
User-agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)

Abhishek_Sharma04 wrote:

I found a bug while merging a file and wanted to know if there is some problem 
with the way we perform merging or it's an inherent CVS bug.
The CVS version we are currently using is 1.11.17.

We first thought that we did some mistake while merge and didn't observe the 
confict. But we were able to reproduce the same scenario again.

I'm sorry, but your diagram got messed up and I couldn't follow your verbal description. Can you please post a sequence of commands that reproduces the behaviour you're observing?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]