Troubleshooting

When making changes directly to files that are managed by Infraxys (container.json, packet.json, role.json), you’ll need to refresh the Infraxys cache using the menu at the top of the UI.
Changes can be done manually, when pulling changes from GitHub, …

GitHub integration

To be able to return to the exact same situation as before troubleshooting or to cherry-pick changes you want to keep:

  • Create a backup of the branch directory.
  • Add a personal repository in GitHub and connect to it in Infraxys.
  • Copy the containers, roles and packets of a branch in Infraxys to your personal backup repository.
  • Fix the issue by making sure your local branch is synchronized with the remote branch.
  • Refresh Infraxys resources using the refresh-menu (make sure any changes are saved first).
  • Refresh all Infraxys browser tabs.
  • Open resources from the branch in the module tree and copy-paste instances, containers, packets, roles, files, … from the backup in your personal repository
  • Open the branch in the filesystem.
  • Copy-paste (part of) files from your backup into this branch
  • Make a diff between your local branch and the one pulled from GitHub (see below for an example)
  • In Infraxys, open the Git-view and push your changes to GitHub.

If you just want your system to contain what’s in a GitHub branch, then you can remove or rename the branch-directory of the module from your filesystem and pull it again using the “Pull from Git”-menu in the module-tree in Infraxys.
Refresh Infraxys resources using the menu at the top and reload your browser tabs.

Make a diff between two branches

To be able to recover attribute values parts of files, … without using other tools, you can:

  • copy the backup of the branch and the new branch
  • remove the .git-directories
  • make a diff
cp -R master new
cp -R master-backup old
rm -Rf new/.git
rm -Rf org/.git
diff -r new org

Remote ref update was rejected, as it would cause non fast-forward update.

If another person has pushed to the same branch as you, Git won’t be able to push your changes.

See "Dealing with non-fast-forward errors"