320
edits
Line 534: | Line 534: | ||
[[Scripted Compilation on Linux Debian/Ubuntu]] | [[Scripted Compilation on Linux Debian/Ubuntu]] | ||
There can be a complication when using a version of FlightGear that has been built with download_and_compile.sh. This involves the combination of two situations; the version is being used and changes are being performed to files within the FlightGear build, furthermore the build is being updated at a later time. During updates, Git keeps an eye on any changes too files within this build. Git assumes that you are a software developer, of course this is no problem if you know what you are doing. So if Git sees a change, like to a joystick file, it thinks you are a developer and keeps track of changes. The issue shows up, after changes were performed, when download_and_compile.sh goes to update the FlightGear build. Git gets involved and needs to know how to integrate your changes with the changes from the update performed by download_and_compile.sh. An easy solution is to make a second copy of FlightGear to use and just update the original. Or make a copy of fgdate and use the FlightGear launcher to point to this working/running version of fgdata. Here we are assuming that the modified or created files are only within fgdata. | There can be a complication when using a version of FlightGear that has been built with download_and_compile.sh. This involves the combination of two situations; the version is being used and changes are being performed to files within the FlightGear build, furthermore the build is being updated at a later time. During updates, Git keeps an eye on any changes too files within this build. Git assumes that you are a software developer, of course this is no problem if you know what you are doing. So if Git sees a change or a new file is created, like to a joystick file, it thinks you are a developer and keeps track of changes. The issue shows up, after changes were performed, when download_and_compile.sh goes to update the FlightGear build. Git gets involved and needs to know how to integrate your changes with the changes from the update performed by download_and_compile.sh. An easy solution is to make a second copy of FlightGear to use and just update the original. Or make a copy of fgdate and use the FlightGear launcher to point to this working/running version of fgdata. Here we are assuming that the modified or created files are only within fgdata. | ||
The following was provided by enrogue <ref>https://forum.flightgear.org/viewtopic.php?f=45&t=36922&start=20</ref> | The following was provided by enrogue <ref>https://forum.flightgear.org/viewtopic.php?f=45&t=36922&start=20</ref> |
edits