best way to handle doc file?

[chiposaur]

we're using a javascript wiki (http://tiddlywiki.com) to manage our 
internal docs and notes. if you're not familiar, it stores all the wiki 
info inside the htmlfile that's used to view the wiki.

the problem we're having is that if we both go adding new info to the 
same wiki page, and then try to merge, the edits bonk...

in order to keep conflicts to a minimum, one of the things I was 
thinking was if we tried to keep the wiki pages as separated as 
possible, meaning new pages for most major items, that would mean 
separate lines in the html file, meaning better mergability.

the real question is this: since we're both going to be adding info 
pretty regularly, i was wondering if there were any other ideas on how 
we could manage it. the obvious is "always pull before adding"... 
unfortunately that's not always possible or doesn't deal with if we're 
workin on it at the same time.