On August 20, 2003 01:16 am, Nirmal Govind wrote: > > You're right! Unfortunately they don't use LyX, although I just got > > the change tracking working last week, so there's opportunity to bring > > them onside :). > > I guess so.. I'm trying myself to get some converts.. :-) > > > examiner, with a CVS commit in between each set. My motivation for the > > thesis is to make it easier to point my advisor to the changes so he > > can see how I've implemented the various suggestions (follow the > > vertical blue bars). Then I'll merge them myself based on his > > feedback. > > That sounds like a great plan.. I think I'll apply your patch and follow > your style of changing/commiting.. that way I guess I can always revert > to something that was there earlier but was removed somewhere down the > line... now do I have the luxury of choosing which changes I want to > revert and which not when I revert to an older version of the file?
Yes, you can go through the changes one-by-one, and either accept or reject them. It's easy to accept or reject one particular change as well, because the merge dialog starts looking for changes at the current cursor position. There is also the option of accepting or rejecting all changes at once. JB -- Johnathan K. Burchill, Ph.D. Department of Physics and Astronomy University of Calgary 2500 University Drive N.W. Calgary, AB T2N 1N4 Canada (403) 217-4286 [EMAIL PROTECTED]
