Actually, I have some object changes pending (minor ones thus far I'm afraid), but they're generally quite standalone. So long as we don't both hit the same areas of code (i.e. you avoid objects, I only touch objects) we should be okay.
I've found it a lot easier to integrate and spot changes since I discovered a merge tool (*filesComparer*) it's been a lot easier to merge changes in. You might want to take a look. The trick is to keep a replica of the code that you started working from in one directory, your modified code in another, and then when you come to merge changes in, download the latest code. Then you compare yours to the latest and merge your new stuff in. If you get confused as to what you have added / has been added by others, the base from which you worked is then useful to clarify.
I'll definitely post up my changes tonight, plus make a start on some docs.
I've found it a lot easier to integrate and spot changes since I discovered a merge tool (*filesComparer*) it's been a lot easier to merge changes in. You might want to take a look. The trick is to keep a replica of the code that you started working from in one directory, your modified code in another, and then when you come to merge changes in, download the latest code. Then you compare yours to the latest and merge your new stuff in. If you get confused as to what you have added / has been added by others, the base from which you worked is then useful to clarify.
I'll definitely post up my changes tonight, plus make a start on some docs.