[Top][All Lists]

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

Re: merging current file with the head?

From: Larry Jones
Subject: Re: merging current file with the head?
Date: Tue, 4 Jan 2005 00:03:20 -0500 (EST)

Peter Teuben writes:
> How does one merge a modified file the latest (HEAD) one in the 
> repository? That is to say, suppose i have a file different from
> the HEAD, and not checked in yet, but want to fully merge (and
> perhaps resolve conflicts) the two.

If I understand your question correctly, that's what update does.

-Larry Jones

You just can't ever be too careful. -- Calvin

reply via email to

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