6,566
edits
FGAddon: Difference between revisions
Jump to navigation
Jump to search
→Development scenarios: Created a new skeleton subsection titled "Team development (git-svn)".
(Deleted the status section - this section no longer makes sense 9 months after FGAddon was activated.) |
(→Development scenarios: Created a new skeleton subsection titled "Team development (git-svn)".) |
||
| 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 (git-svn) === | |||
{{Note|Development scenario: One team leader is acting as the gatekeeper on a private git repository, using git-svn to push a fgaddon branch to FGAddon, with team members committing directly to the private repository or making merge requests from their fork of the private repository.}} | |||
[[Category:FlightGear]] | [[Category:FlightGear]] | ||