[Top][All Lists]

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

Re: cvs merge crash !!

From: Kaz Kylheku
Subject: Re: cvs merge crash !!
Date: Thu, 20 Dec 2001 23:30:20 GMT
User-agent: slrn/ (Linux)

In article <address@hidden>, Zanabria, Moises wrote:
>That does mean that is no way to check a merge before I really want to

A merge operation does nothing to the repository; all it does is edit your
local files.  A separate commit step is necessary to put the results of
the merge into the repository, after any conflicts are resolved and it
is verified that the results are sane.

If you want to be able to check a merge, make sure you have no other
outstanding changes, that your working copy is up to date with no local
modifications. That way when you merge, the changes from the merge won't
be conflated with any other outstanding changes. If you decide not to
do the merge, you can just throw away all local modifications.

reply via email to

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