936
edits
User:Callahanp: Difference between revisions
Jump to navigation
Jump to search
Using git to deliver changes
(Add High Altitude Flight and Spaceflight) |
(Using git to deliver changes) |
||
| Line 132: | Line 132: | ||
1,2,3 - Build, run, open flightgear and simgear in vscode and use it's debugger. | 1,2,3 - Build, run, open flightgear and simgear in vscode and use it's debugger. | ||
|- | |||
|Changing Flightgear Materials - In addition to pulling from the official flightgear git repos, you want to make changes and bug fixes on branches, pushing your changes to private forks and submitting merge requests to have your changes integrated with the official repos. | |||
|In the situation described in the altassian tutorial, the author mentions three options for dealing with additional changes suggested in response to a merge request. The article doesn't clearly state what the three options are. | |||
|https://www.atlassian.com/git/tutorials/git-forks-and-upstreams | |||
|} | |} | ||