Z-Push
Page tree

Versions Compared

Old Version 6

changes.mady.by.user Felix Bartels

Saved on

compared with

New Version Current

changes.mady.by.user Manfred Kutas

Saved on

Key

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

...

All following commands, you have to call from within this directory, so just cd into it.

Most common actions

CommandDescription
git status

Shows information about the current status of your local repository. Most importantly, it shows which code version (branch) is currently available in the directory. Example:

On branch develop
Your branch is up-to-date with 'origin/develop'.
git pull
 Gets the latest updates from the main online (also called origin) repository. This is similar to svn update.
git tag

 Shows all available tags (versions). To update this list, you should do git pull first. Example:

2.2.3
2.2.3beta
2.2.4alpha
2.2.4alpha1
2.2.4beta1
git checkout -b tagSwitches your workspace to the defined tag or branch and creates it localy. If you want to switch to it again later, omit the "-b" parameter.

 

Use cases

Below a list of a few use cases which could make it easier to use/update z-push on GIT basis.

...

These are available in the "release/2X.2X" branch (later there will be other release branches, like "release/2.3").

Just:

  1. git checkout release/2.2        to switch to the release 2.2.x branchgit checkout release/2.3        to switch to the release 2.3.x branch

This one contains 2.23.x alphas (for final QA'ing), betas and final releases.

...

You also could chose not to use e.g. alphas by not pulling until you see the beta announcement. The pull will immediately apply all changes. This is possible, but not very safe because you could accidentally pull and get an alpha version.

Latest development

...

titleLatest news about develop

...

There is also the "develop" branch, which contains everything available, independently from a version. This is basically the "nightly" build or the SVN trunk.

...

Info

You can use one or all of the described methods together. So, you can use master, but switch to release/2.23 to test the current beta and then later switch back to master again. The only limitation to this might be local changes, e.g. to the config file which might lead to conflicts.

...