6,566
edits
(→Team development (git-svn): Filled out the section, and renamed it.) |
(→Development scenarios: Added a new subsection about team development directly on FGAddon.) |
||
Line 312: | Line 312: | ||
If you keep your local master separate from FGAddon you would need to cherry-pick upstream updates you want to your master branch. These days I always use git-svn rather than the ordinary SVN tools when working with SVN repositories. It is just so much nicer to me. | If you keep your local master separate from FGAddon you would need to cherry-pick upstream updates you want to your master branch. These days I always use git-svn rather than the ordinary SVN tools when working with SVN repositories. It is just so much nicer to me. | ||
=== Team development === | |||
This simplest way to work as a team is for each developer to either have a [[#Individual developer|svn copy of FGAddon]] or a [[#Individual developer (git-svn)|git-svn copy of FGAddon]], and everyone commits directly to FGAddon. Communication and coordination between the team members may be best on the [http://forum.flightgear.org/ FlightGear forum]. | |||
=== Private team development (git-svn) === | === Private team development (git-svn) === |