Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • git-checkout
    • checks out a specific branch or tag from the repository.
  • git-clone
    • clones a repository locally for the first time.
  • git-pull
    • pulls the recent changes from the remote repository into the local repository

Merge

...

Force Overwrite

Overwrites forcefully a connfguration with the chosen source configuration between a GIT repository and a JS7 instance.

Note
  • JOC will not support 3rd party diff tools nor will a diff tool be implemented into JOC.
  • For managing JS7 configuration objects merging means to provide a possibility to choose which state of the configuration object is the chosen one to use and in which direction it is to be populated. Effectively the chosen source configuration will forcefully overwrite the target configuration.
  • JOC does not support merging between different GIT repositories or between different branches of one GIT repository as this is standard GIT functionality and can be done with any git tools outside of JOC.

The JOC web services manage the merge process.

A force direction has to be provided.

Commands / Services

  • JS7 instance → GIT repository
    • git-add
      • Adds (new) configuration object(s) from a working copy (currently the DB) to a local repository.
    • git-delete
      • Removes an already added configuration object from the local repository.
    • git-commit
      • Commits newly added, changed or removed configuration objects to a local repository.
    • git-push
      • Pushes the changes from the local repository to the connected remote repository.
  • GIT repository → JS7 instance
    • git-checkout
      • checks out a specific branch or tag from the repository.
    • git-clone
      • clones a repository locally for the first time.
    • git-pull
      • pulls the recent changes from the remote repository into the local repository


Use Cases

Single User (Backup and Versioning Tool)

...