Skip to main content
Jump to: navigation, search

Difference between revisions of "Orion/Documentation/User Guide/Reference/Repositories page"

Line 37: Line 37:
  
 
[[Image:Orion-repository-page-branch-actions-delete.png]]
 
[[Image:Orion-repository-page-branch-actions-delete.png]]
 +
 +
=== Navigating to log page ===
 +
 +
You can navigate to the [[Orion/Documentation/User Guide/Reference/Git Log page|Log page]] to see details on the branch. From the actions when you hover over the branch, click on the <b>Show Git Log</b> as the link to the Git log page.
 +
 +
=== Merging from the remote tracking branch ===
 +
 +
You can also perform merge action if there is a remote tracking branch. But normally the remote branch does not exist yet for a newly created branch before you <b>push</b> it. From the actions when you hover over the branch, click on the third action to merge from the remote tracking branch.
 +
 +
[[Image:Orion-repository-page-branch-actions-merge-local.png]]
 +
 +
<b>Please note</b> that you can achieve the same result by performing the same action in [[Orion/Documentation/User Guide/Reference/Git Log page|Log page]] or [[Orion/Documentation/User Guide/Reference/Git Status page|Status page]].
  
 
=== Setting a local branch as current branch===
 
=== Setting a local branch as current branch===
Line 44: Line 56:
 
[[Image:Orion-repository-page-branch-actions-checkout.png]]
 
[[Image:Orion-repository-page-branch-actions-checkout.png]]
  
Once the branch is checked out, it is shown as bold. <b>Please note</b> that from now the [[Orion/Documentation/User Guide/Reference/Git Status page|Git Status page]] will show the content on this branch.
+
Once a branch is checked out, it is shown as bold. <b>Please note</b> that from now the [[Orion/Documentation/User Guide/Reference/Git Status page|Git Status page]] will show the content on this branch.
  
 
[[Image:Orion-repository-page-branch-actions-checkout-bold.png]]
 
[[Image:Orion-repository-page-branch-actions-checkout-bold.png]]
 +
 +
=== Pushing a local branch===
 +
Once a branch is checked out, the actions change as below when you hover over the branch.
 +
 +
[[Image:Orion-repository-page-branch-actions-push.png]]
 +
 +
Clicking on the <b>Push All</b> action will create a remote tracking branch if there is not one yet.
 +
 +
[[Image:Orion-repository-page-branch-actions-push-result.png]]
 +
 +
<b>Please note</b> that you can achieve the same result by performing the same action in [[Orion/Documentation/User Guide/Reference/Git Log page|Log page]] or [[Orion/Documentation/User Guide/Reference/Git Status page|Status page]].

Revision as of 13:46, 24 June 2011

Repositories page

The Repositories page allows you to view and manage the Git repositories associated with your Orion account. When you visit this page you will see a list of all Git repositories you currently have cloned. Expand a repository to view the local and remote branches available in your clone. The currently checked out local branch is shown in bold.

Orion-repository-page.png


Adding repositories

Create a new empty repository by clicking Init Repository on the tool bar, or click Clone Repository to clone an existing Git repository. Cloning will produce a dialog where you enter the Git repository URL, and optionally any credentials required to access or modify the repository.

Actions on a repository

You can delete an existing repository or navigate to the Navigator page. Hover over the repository name row in the repositories table to pop up actions as below.

Orion-repository-repo-actions.png

Clicking on the Delete action will pop up a confirmation dialog and you can decide if you want to delete it. Clicking on the Show in Navigator navigates to the Navigator page.

Adding branches

Once a repository is created or cloned, the master branch is set as the current branch. You can create your own branch, work on it and merge it back to master. Hover over the Branch row in the repository table to pop up the Add Branch action icon. Then hover over the action.

Orion-repository-page-add-branch.png

Clicking on the action and input the branch name. Hit enter key to create the branch.

Orion-repository-page-add-branch-name.png

Actions on a local branch

Once a new branch is created, it is in the local but not in the remote yet. Hover over the branch name row in the Branch table to pop up actions as below. You can manage the branch by these actions.

Orion-repository-page-branch-actions-not-current.png

Deleting a local branch

From the actions when you hover over the branch, click on the first action to delete the branch. A confirmation dialog will pop up and you can decide if you want to delete it.

Orion-repository-page-branch-actions-delete.png

Navigating to log page

You can navigate to the Log page to see details on the branch. From the actions when you hover over the branch, click on the Show Git Log as the link to the Git log page.

Merging from the remote tracking branch

You can also perform merge action if there is a remote tracking branch. But normally the remote branch does not exist yet for a newly created branch before you push it. From the actions when you hover over the branch, click on the third action to merge from the remote tracking branch.

Orion-repository-page-branch-actions-merge-local.png

Please note that you can achieve the same result by performing the same action in Log page or Status page.

Setting a local branch as current branch

The newly created branch branch is not set as the current branch yet. Let's say you want to work on this branch now. From the actions when you hover over the branch, click on the last action to checkout the branch.

Orion-repository-page-branch-actions-checkout.png

Once a branch is checked out, it is shown as bold. Please note that from now the Git Status page will show the content on this branch.

Orion-repository-page-branch-actions-checkout-bold.png

Pushing a local branch

Once a branch is checked out, the actions change as below when you hover over the branch.

Orion-repository-page-branch-actions-push.png

Clicking on the Push All action will create a remote tracking branch if there is not one yet.

Orion-repository-page-branch-actions-push-result.png

Please note that you can achieve the same result by performing the same action in Log page or Status page.

Back to the top