GIT: Unterschied zwischen den Versionen
Zur Navigation springen
Zur Suche springen
Alkurz (Diskussion | Beiträge) (Update merge and discard changes) |
Cg (Diskussion | Beiträge) (Weiterleitung nach GIT Plugin erstellt) |
||
| (3 dazwischenliegende Versionen von einem anderen Benutzer werden nicht angezeigt) | |||
| Zeile 1: | Zeile 1: | ||
#redirect [[GIT Plugin]] |
|||
== 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>''. |
|||
<!-- git add: Add file contents to the index --> |
|||
=== 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. |
|||
<!-- git commit: Record changes to the repository --> |
|||
* '''''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. |
|||
<!-- git push: Update remote refs along with associated objects --> |
|||
=== 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. |
|||
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... === |
|||
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 == |
|||
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 into newest Version of Branch === |
|||
Merge with HEAD of the current 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 with Branch... === |
|||
Update your testsuite-content with the version of another branch, you select in a dialog. |
|||
=== Merge into Branch... === |
|||
Merge your testsuite-content into the version of another branch, you 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. |
|||
Aktuelle Version vom 30. Juli 2019, 16:48 Uhr
Weiterleitung nach:
