[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Mon, 21 Jan 2002 18:08:24 -0500
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
- 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.
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. address@hidden
| | /
One ring to rule the mall.
- Movie review headline, eye Magazine
- conflict, Schwenk, Jeanie, 2002/01/21
- Re: conflict,
Eric Siegerman <=