On Mon, Jan 21, 2002 at 01:39:26PM -0800, Schwenk, Jeanie wrote:
> We had a large set of files checked into the respository but they had
> windows line endings. One other developer and myself checked out, scripted
> the bad line endings away. In the meantime, prior to commits, a branch was
> made. These files still have the windows line endings because we had not
> committed. Changes have been made down that branch.
Try this. Make backups before, during, and after, of course:
- check out a sandbox ON THE BRANCH that's causing the problem
- "script away" the Windows line endings there
- commit
- now try the merge again
> Is there a way (when there is a conflict) to have white space ignored during
> a merge?
Not that I know of.
Good luck!
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
| | /
One ring to rule the mall.
- Movie review headline, eye Magazine
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
