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


_______________________________________________
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs

Reply via email to