git — Orx: Portable Game Engine https://forum.orx-project.org/index.php?p=/ Wed, 08 Apr 2026 21:38:03 +0000 git — Orx: Portable Game Engine en git out of sync https://forum.orx-project.org/index.php?p=/discussion/9018/git-out-of-sync Tue, 20 Nov 2018 21:11:18 +0000 General discussions sausage 9018@/index.php?p=/discussions The git repo was out of sync yesterday and has since been repaired. You might get merge conflicts when pulling down. If so you can either delete and re-clone your repo or use this:

git pull -X theirs origin master

]]> en