stash is beautiful way to keep a "private" version not pushed (or commited)
the point is, you could potentially commit and push into the FGDATA next with submodules repository, but changes to FGDATA are better trying to be pushed upstream (over the FGDATA next, from the devel-cores.... if possible)
If your changes on FGDATA can be shared, I mean (ie, it is not a private hack, and respect the GPL spirit).
For changes on FGDATA that are private (for one's install only), if you have a git repository, then Stash works great
https://git-scm.com/book/en/v1/Git-Tools-StashingBriefly
1. Make changes as needed
2. Before updating your repo (with pull) do the stash
- Code: Select all
git stash
3. Update your repo
- Code: Select all
git pull
4. Re-apply your stashed changes again
- Code: Select all
git stash apply
Notes:
1, Stash will only save uncommitted work on your repo. If you comitted locally it will not stash.
If you commit, but it creates merge conflict, then the conflict will need to be resolved (tipically a manual labor) --thus stash is better for local modifications. Commit is the way to go if your intent is to push elsewhere
2. If you need to re-stash it will create a list of pass stashes
- Code: Select all
git stash list
Shows your list
3. git stash apply will apply your latest stash, but you can apply older stashed with modification of the apply command. Read the FM
===
Best,
IH-COL
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it? Probably not, because if they don’t recognise their freedoms, they’ll let their freedoms fall