From: Till Adam <till@ad...> - 2002-03-04 22:50:54
# Quoting Brian Mattern (bmattern@...):
> > Ehm, did you simply not like the way I changed that and reverted it on
> > purpose, or did you forget to update from cvs before commiting?
> Oops. Sorry about that. I had a lot of conflicts due to indent changes,
> and thought i resolved them all, but i guess i got some messed up.
I'm sorry about the indent run, I should have asked if someone wants to
commit larger changes first. Oh well, you live, you learn.
> Your way is definately better. I wonder if i reverted some other stuff
> in there too. How exactly do i go about reconciling this? (refert the
> commit and try again?)
I really dont know. I'm afraid you'll need to revert, and either check
out whats in cvs now and merge your changes into that, or check out into
your copy and resolve all the conflicts. Both not a lot of fun :(.
Anyone any better ideas as to how to do this?
THe patch looked good apart from that, though. Looking forward to it. :)
Get latest updates about Open Source Projects, Conferences and News.