SourceTree: Difference between revisions
Jump to navigation
Jump to search
| (2 intermediate revisions by the same user not shown) | |||
| Line 3: | Line 3: | ||
== Introduction == | == Introduction == | ||
<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). | <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). | ||
Sourcetree strips away the complexity of DVCS amd makes it usable for mere mortals. | <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" | {| class="wikitableharm" width="1250px" | ||
|- style="vertical-align:top;" | |- style="vertical-align:top;" | ||
| Line 12: | Line 17: | ||
* See for OSX: {{FormFCTW|8|blue|bold|Sourcetree}} → {{FormFCTW|8|blue|bold|Preferences}} → {{FormFCTW|8|blue|bold|Git}} → {{FormFCTW|8|blue|bold|Git Version}} | * 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 | There are 3 git version mentioned, see the description on the right. | ||
| width="55%" | | | width="55%" | | ||
{| class="wikitableharm" width="650px" | {| class="wikitableharm" width="650px" | ||
| Line 19: | Line 24: | ||
! width="200px" | Description | ! width="200px" | Description | ||
! width="200px" | Link | ! width="200px" | Link | ||
! width="200px" | Location | |||
|- | |- | ||
| git || | | 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-flow || Git Workflow || [https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/git-flow git-tower], Git-flow | ||
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.