f504cf54e1
We simply do a `git merge --ff-only` instead of a `git reset`. This way:
- No change on the local repository
=> update to `remote/master`
- If you switch branch and local branch is behind `remote/master`
=> fast forward to `remote/master`
- If you switch branch and branches diverge
=> No update of the directory
- On branch master (or a branch behind `origin/master`) with compatible
change in the working tree.
=> update of the directory
- On branch master (or a branch behind `origin/master`) but incompatible
change in the working tree.
=> No update.
This way, sources are keep up-to-date as far as possible.
|
||
|---|---|---|
| .. | ||
| dependencies | ||
| patches | ||
| platforms | ||
| templates | ||
| __init__.py | ||
| __main__.py | ||
| _global.py | ||
| buildenv.py | ||
| builder.py | ||
| flathub.flatpakrepo | ||
| flatpak_builder.py | ||
| packages.py | ||
| utils.py | ||
| versions.py | ||