[Top][All Lists]

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

merging current file with the head?

From: Peter Teuben
Subject: merging current file with the head?
Date: Mon, 03 Jan 2005 23:18:06 -0500
User-agent: Mozilla Thunderbird 1.0 (X11/20041206)

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.


reply via email to

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