[Soc-2012-dev] Wiki documentation + code.blender.org post

Antony Riakiotakis kalast at gmail.com
Mon May 21 11:51:48 CEST 2012


Good start for everyone for this Summer Of Code.

I have a bit of a worry though. How are we going to manage merging
with trunk with multiple branch users?
Is it possible to commit files belonging to others with conflicts in
them so that people sharing the branch can resolve later? This may
prove a bit painful. If that's the case then I propose that a merge
policy (for instance once a week?) where branch members resolve
conflicts in the code.


More information about the Soc-2012-dev mailing list