FlightGear Git: Difference between revisions

Jump to navigation Jump to search
Line 275: Line 275:
Next select the commits you would like to include in your merge request and click "Create merge request".
Next select the commits you would like to include in your merge request and click "Create merge request".


Note that it usually doesn't suffice to just send a merge request (unfortunately), but that you'll often also need to "ping" 1-3 core developers who have previously worked with the subsystems affected by the patch (and send a reminder once in a while).  
Note that it usually doesn't suffice to just send a merge request via gitorious (unfortunately), but that you'll often also need to "ping" 1-3 core developers who have previously worked with the subsystems affected by the patch (and send a reminder once in a while).  


It makes sense to watch the forums/mailing lists or just the git history to see which developers are currently active. To get a list of people who have previously worked with the affected subsystems/files, just take a look at the commit log of the corresponding files and get in touch with the developers via the devel list or forum.
It makes sense to watch the forums/mailing lists or just the git history to see which developers are currently active. To get a list of people who have previously worked with the affected subsystems/files, just take a look at the commit log of the corresponding files and get in touch with the developers via the devel list or forum.


Also, it may help to send a follow-up (merge request review) via the issue tracker here: https://code.google.com/p/flightgear-bugs/issues/entry?template=Review%20request
Also, it may help to send a follow-up (merge request review) via the issue tracker here: https://code.google.com/p/flightgear-bugs/issues/entry?template=Review%20request
Currently, it isn't uncommon for merge requests to take 2-4 weeks, and sometimes even 1-2 months before being reviewed and committed. Your chances of getting your code committed upstream are much better directly after a release, than shortly before a release obviously (feature freeze).


=== Commit the changes into the GIT ===
=== Commit the changes into the GIT ===

Navigation menu