SourceTree: Difference between revisions
Jump to navigation
Jump to search
Created page with "{{TOCright}} == Introduction == <code>Atlassian's Sourcetree</code> is a powerful Mac and Windows clients for Mercurial and Git distributed Version Control Systems (VCS). ==..." |
|||
| (7 intermediate revisions by the same user not shown) | |||
| Line 2: | Line 2: | ||
== Introduction == | == Introduction == | ||
<code>Atlassian's Sourcetree</code> is a powerful Mac and Windows clients for Mercurial and Git | <code>Atlassian's Sourcetree</code> <ref>[https://www.sourcetreeapp.com SourceTree], Atlassian SourceTree Home page.</ref> is a powerful Mac and Windows clients for Mercurial and Git Distributed Version Control Systems (DVCS). | ||
<br>Sourcetree strips away the complexity of DVCS amd makes it usable for mere mortals. | |||
<br>This page is intended for {{FormFCTW|8|blue|bold|Apple OSX}} and {{FormFCTW|8|red|bold|not for Windows}}. | |||
== Git Versions == | |||
When using a GUI Client for a '''C'''ommand '''L'''ine '''T'''ool (CLI) it is always important to: | |||
* Check the different version | |||
* Check the location of the tools | |||
{| class="wikitableharm" width="1250px" | |||
|- style="vertical-align:top;" | |||
| width="45%" | | |||
<code>Sourcetree</code> uses its own embedded Git Version by default. | |||
* See for OSX: {{FormFCTW|8|blue|bold|Sourcetree}} → {{FormFCTW|8|blue|bold|Preferences}} → {{FormFCTW|8|blue|bold|Git}} → {{FormFCTW|8|blue|bold|Git Version}} | |||
There are 3 git version mentioned, see the description on the right. | |||
| width="55%" | | |||
{| class="wikitableharm" width="650px" | |||
|- | |||
! width="100px" | Git CLI | |||
! width="200px" | Description | |||
! width="200px" | Link | |||
! width="200px" | Location | |||
|- | |||
| git || Atlassian Git || [https://git-scm.com Git Home]], Git scm || /Applications/SourceTree.app/Contents/Resources/git_local/bin/git | |||
|- | |||
| git-flow || Git Workflow || [https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/git-flow git-tower], Git-flow | |||
|- | |||
| git-lfs || Git Large File Storage || [https://www.atlassian.com/git/tutorials/git-lfs Atlassian Tutorial], Git-lfs | |||
|} | |||
|} | |||
== Branching & Merges == | == Branching & Merges == | ||
* Source: [https://support.atlassian.com/bitbucket-cloud/docs/use-sourcetree-brances-to-merge-an-update Atlassian Support], Use Sourcetree branches to merge an update | * Source: [https://support.atlassian.com/bitbucket-cloud/docs/use-sourcetree-brances-to-merge-an-update Atlassian Support], Use Sourcetree branches to merge an update. | ||
| Line 11: | Line 41: | ||
<span class="editsection">[[#content|top]]</span> | <span class="editsection">[[#content|top]]</span> | ||
* [[Beyond Compare]] | * [[Beyond Compare]] | ||
* [[Git]] | * [[Git]] contains also information on branches and Merging. | ||
* [[Sublime Text]] | * [[Sublime Text]] | ||
Latest revision as of 18:12, 8 October 2021
Introduction
Atlassian's Sourcetree [1] is a powerful Mac and Windows clients for Mercurial and Git Distributed Version Control Systems (DVCS).
Sourcetree strips away the complexity of DVCS amd makes it usable for mere mortals.
This page is intended for Apple OSX and not for Windows.
Git Versions
When using a GUI Client for a Command Line Tool (CLI) it is always important to:
- Check the different version
- Check the location of the tools
|
There are 3 git version mentioned, see the description on the right. |
|
Branching & Merges
- Source: Atlassian Support, Use Sourcetree branches to merge an update.
See also
- Beyond Compare
- Git contains also information on branches and Merging.
- Sublime Text
Reference
- ↑ SourceTree, Atlassian SourceTree Home page.