View Single Post
  #3 (permalink)  
Old October 26th, 2005
rkapsi rkapsi is offline
Valued Member contributor
 
Join Date: August 10th, 2003
Location: In the middle of nowhere (54°N 10°E)
Posts: 318
rkapsi is flying high
Default

It is actually possible to say when! When LW is dead!

We have tons of ideas but we cannot add/implement them yet because each mod leads to so called conflicts between the FW and LW codebase. As long as LW is alive we'd like to pick up as much code as possible from them.

The whole topic about CVS conflicts is a bit abstract and probably not understandable for non-devs...

Several clients may edit copies of the project concurrently. When they later check-in their changes, the server attempts to merge them. If this fails, for instance because two clients attempted to change the same line in a certain file, then the server denies the second check-in operation and informs the client about the conflict, which the user will need to resolve by hand.

...by hand!!! No way! Work is bad!
Reply With Quote