[Top][All Lists]

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

Re: CVS pedantic when doing merges

From: Larry Jones
Subject: Re: CVS pedantic when doing merges
Date: Thu, 12 Feb 2004 12:40:50 -0500 (EST)

m0llbuz_  writes:
> I wonder if I can somehow merge a branch to the main trunk, ignoring
> white space diffs.

Not with CVS -- that's not a merge, it's something else.  If you're sure
you know what you're doing, you can use CVS to get whatever kind of diff
you want and then try to apply it with patch.

-Larry Jones

I don't want to be THIS good! -- Calvin

reply via email to

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