[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Conflict committed
From: |
David Wood |
Subject: |
Re: Conflict committed |
Date: |
Wed, 29 Oct 2003 11:52:11 -0500 |
Thank you! This is very helpful in reconstructing what happened.
address@hidden (Larry Jones) wrote on 10/29/2003 11:40:51 AM:
> David Wood writes:
> >
> > Are my assumptions about this mistaken? What circumstances allow
> > unresolved conflicts to be committed back to the repository?
>
> If CVS had detected a conflict (which is recorded in the CVS/Entries
> file) and the file has not been modified, CVS will not allow the commit.
> If the file has been modified but still contains what look like conflict
> markers, CVS will issue a warning but allow the commit. Otherwise, you
> couldn't ever commit a file containing real data that just happens to
> look like conflict markers.
>
> -Larry Jones
>
> You're going to be pretty lonely in the nursing home. -- Calvin