GIT - Versionsgeschichte

Cg: Weiterleitung nach GIT Plugin erstellt

2019-07-30T16:48:24Z

Weiterleitung nach GIT Plugin erstellt

Änderungen zeigen

Alkurz am 29. Juli 2019 um 13:21 Uhr

2019-07-29T13:21:08Z

Änderungen zeigen

Alkurz am 23. Juli 2019 um 15:17 Uhr

2019-07-23T15:17:17Z

← Nächstältere Version		Version vom 23. Juli 2019, 15:17 Uhr
Zeile 107:		Zeile 107:
	=== Merge with branch... ===		=== Merge with branch... ===

	~~Update~~ ~~your~~ ~~testsuite-~~content ~~with~~ ~~the~~ ~~version~~ of another branch, you select in a dialog.		Merges the content of yout testsuite from another branch, you select in a dialog-box, to your testsuite-content.

	This command doesn't ~~switch~~ the branch in your working directory.		This command doesn't change the branch in your working directory.

	Executed git-command: ''git checkout <comparebranch>''		Executed git-command: ''git checkout <comparebranch>''
Zeile 118:		Zeile 118:
	=== Merge into Branch... ===		=== Merge into Branch... ===

	Merge your testsuite-content into the version of another branch, you select in a dialog.		Merge your testsuite-content into the version of another branch, you select in a dialog-box.

	This command switches the branch in your working directory to the selected branch.		This command switches the branch in your working directory to the selected branch.

Alkurz am 19. Juli 2019 um 16:29 Uhr

2019-07-19T16:29:09Z

Änderungen zeigen

Alkurz: Update merge and discard changes

2019-07-17T16:47:13Z

Update merge and discard changes

← Nächstältere Version		Version vom 17. Juli 2019, 16:47 Uhr
Zeile 42:		Zeile 42:

	Downloads objects and refs from the remote repository, but don't change the local files files.		Downloads objects and refs from the remote repository, but don't change the local files files.

			Because autimatically merge by git isn't possibly, you can get merge-conflicts. To avoid this, better use '''''Merge into newest Version of Branch'''''.

	=== Checkout branch... ===		=== Checkout branch... ===

	To change your working branch, use the '''''Checkout branch...'''''-command. In a dialog you can choose you desired branch.		To change your working branch, use the '''''Checkout branch...'''''-command. In a dialog you can choose you desired branch.

			=== Discard changes in working directory ===

			If you get conflicts by changing the branch, you can either commit your file or discard the changes.

	== Comparing and merging ==		== Comparing and merging ==
Zeile 53:		Zeile 59:
	In every case the Expecco-ProjectDifferenceBrowser will open. After merging you have to save, add and commit your testsuite (and then push).		In every case the Expecco-ProjectDifferenceBrowser will open. After merging you have to save, add and commit your testsuite (and then push).

	=== Merge ~~with~~ ~~HEAD~~ of ~~the current branch~~ ===		=== Merge into newest Version of Branch ===

			Merge with HEAD of the current branch.

	To ~~update~~ ~~your~~ ~~file~~ ~~and~~ ~~take~~ ~~over~~ the changes done by ~~others~~ ~~use~~ ~~'''''Merge~~ ~~into~~ ~~newest~~ ~~branch'''''~~		You get the newest version of the current branch from the repository with the changes done by other and can take over the changes your changes.

	=== Merge ~~your~~ ~~testsuite-content~~ ~~into another branch =~~===		=== Merge with Branch... ===

	~~Checks out the branch you select in a Dialog and merges~~ your testsuite content ~~into~~ the ~~newest~~ version of ~~the~~ ~~selected~~ ~~branch~~.		Update your testsuite-content with the version of another branch, you select in a dialog.

			=== Merge into Branch... ===
	=== Update your testsuite-content with another branch ===

	~~Updates~~ your testsuite-~~file with the~~ content of the ~~newest~~ version of ~~the~~ branch you ~~can~~ select in a dialog.		Merge your testsuite-content into the version of another branch, you select in a dialog.

Alkurz: git-plugin for expecco

2019-07-15T15:35:32Z

git-plugin for expecco

Neue Seite

== Preconditions ==

The plugin provides git-functionality for testsuites.

For proper work you need a remote-repository and access to it without entering user name and password.

== Initialization ==

=== Configuration ===

With Git - Administration - Config you can set the global git parameters for user name and mail-address.

=== Get the local git repository ===

Provide the functionality of 'git clone': Cloning a repository into a a new local directory.
A dialog asks for the url of the remote repository.

== Workflow ==

=== Add ===
Before you can commit your new or changed testsuite, you have add the file to the git index with the '''''Add'''''-command.
It executes ''git add <testsuite-file>''.


=== Commit ===

The added files you can commit to your local branch by using the '''''Commit...'''''-command. A message-box will appear to enter the commit-message. An empty commit-message is not allowed.

* '''''Add and commit...'''''<br /> Combines the add- and commit-command.
* '''''Commit (amend)'''''<br /> Replace the tip of the current branch by creating a new commit. The new commit has the same parents and author as the current one. <br />You should understand the implications of rewriting history if you amend a commit that has already been published!

=== Push ===

To publish your test-suite to the remote-repository you have to push it.


=== Pull ===

Incorporates changes from the remote repository into the current branch.

=== Fetch ===

Downloads objects and refs from the remote repository, but don't change the local files files.

=== Checkout branch... ===

To change your working branch, use the '''''Checkout branch...'''''-command. In a dialog you can choose you desired branch.

== Comparing and merging ==

You can compare and merge your testsuite in three different kinds.

In every case the Expecco-ProjectDifferenceBrowser will open. After merging you have to save, add and commit your testsuite (and then push).

=== Merge with HEAD of the current branch ===

To update your file and take over the changes done by others use '''''Merge into newest branch'''''

=== Merge your testsuite-content into another branch ====

Checks out the branch you select in a Dialog and merges your testsuite content into the newest version of the selected branch.

=== Update your testsuite-content with another branch ===

Updates your testsuite-file with the content of the newest version of the branch you can select in a dialog.

== Status dialogs ==

=== Show Log ===

Displays a dialog with the commit logs of the current branch.

=== Show Status ===

Shows the working tree status.

== Not implemented ==
* Create and drop branches.
* Use of the git-stash-command.