[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Merging in CVS
From: |
Shankar Unni |
Subject: |
RE: Merging in CVS |
Date: |
Fri, 22 Nov 2002 10:12:05 -0800 |
> Thanks. Looks like merges must be difficult in CVS. A lot of manual
work.
Oh, do you know of a configuration management system that can read human
minds?
Basically, two changes have been made to the *same spot*: one in your
work area, and one checked in by someone else. Which change should be
kept when you update to the latest version in the repository?
CVS certainly can't guess for you, so it marks it in a conflict block.
So does every other CM system.
--
Shankar.
- Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS,
Shankar Unni <=
- Re: Merging in CVS, Thomas S. Urban, 2002/11/22
- Re: Merging in CVS, Larry Jones, 2002/11/22
- Re: Merging in CVS, Kaz Kylheku, 2002/11/22
- Re: Merging in CVS, Eric Siegerman, 2002/11/22
- RE: Merging in CVS, Greg A. Woods, 2002/11/22
- RE: Merging in CVS, MacMunn, Robert, 2002/11/22
- RE: Merging in CVS, MacMunn, Robert, 2002/11/22