You can create branches by selecting the option create branch at the bottom right side of the screen. The new branch will be created from the current branch the user sits. For example if the user decide to create a branch from verne/testing they must select verne/testing branch and select after that New Branch.
Once select New branch option users will be presented with a screen to set the branch name
The new branch has been created
Checkout branches
You can switch branches by selecting the branch name on the lower right side of Magellan builder.
And select checkout branch
Stash / Unstash Changes
Managing changes with Git stash is possible from the Stash / Unstash menu items.
The git stash command takes your uncommitted changes (both staged and unstaged), saves them away for later use, and then reverts them from your working copy
Unstash allows you to reapply previously stashed changes, selecting the ‘Pop’ checkbox will remove the stash from the stash list once it has been applied successfully.
Pull and Push
Another feature from Magellan builder is the ability to pull and push from a branch.
From Git:
git-pull – Fetch from and integrate with another repository or a local branch.
git-push – Update remote refs along with associated objects
To access Pull and Push users must click the link below
Once the icon is clicked the user will be able to Pull and Push.
Individual Commit
After a change happen users can find all files with changes under the Git section. Selecting the file and opening the context menu by Right-Click will enable users to commit the changes
From Git:
git-commit – Record changes to the repository
Multiple Commit
In case that multiple changes need to be committed users can review and update all changes together by selecting right click on Default change list
Once clicked Commit changes screen will show and you can select and review the changes before commit
Merge
One of the common activities while working with software development is merge branches into. For this purpose Magellan provides this capability by selecting the option Merge selected into current.
In the following example we want to merge master branch into verne/testing branch. The steps are:
Select branch which we want to merge
Select option Merge selected into current.
Resolve conflicts
Resolve conflict is one of the most complex task when working with Git. Magellan offers the support to resolve conflicts in an easy way by using a 3 way diff tool. In order to resolve conflicts in Magellan users must:
Identify the conflict
Right click over the file with conflicts and select Resolve Conflicts
Resolve conflicts by selecting the right option that will override the conflict
Once click Save user must acknowledge that the conflict has been resolved
User must conclude the resolution by Right-Click on the icon and select Conclude Merge to push the changes
Abort changes will rollback the changes to the state before the conflict
