Sourcetree git flow for free#
Sourcetree git flow how to#

To open this branch for collaboration you first need to push the branch to remote Note that this branch is just visible for you at this point. Sourcetree automatically creates the feature brachen following the naming convention feature/feature-name and you are atomatically switching to that branch. To create a new feature click on Git Flow and then in Start New Feature. Sourcetree will then create an additional develop branch off of master. You should leave the names of the branches as they are and just hit OK. To initialize a repository for Gitflow you just need to click on the Git Flow button. Initializing GitFlowĪs mentioned, Sourcetree prefectly integrates Gitflow. If conflicts happen you need to solve them first before being able to commit and push merge changes. Sourcetree automatically commits theses changes, all you have to do is push them to the remote server. Usually this causes some changes to your code since it get's updated. In that dialog you need to choose the commit of a branch you want to merge into the current branch. To merge one branch into your current branch, just click on Merge

Merging needs to be performed everytime you need to to get updates of another branch to be applied to your branch. If you want to know more about this, please visit the official documentation Merging branches

Push With a push, all the commits are sent to the remote server, so other users.

A commit just happens locally, the remote repository didn't notice anything yet. Choose many commits with small changes before less commits with a lot of bundled commits. It is important that you use descriptive commit messages and commit changes in logical packages. By providing a commit message you are able to describe your commits for others.

Commit is the process when your staged changes will be added to the git history.

You can select files or even chunks of code in files to be committed. This gives you the chance of bundle changes to have logical commit packages.

Staging is the process where you can select which changes should be committed afterwards.

It's really important to know the difference between staging, do a commit and Just give it a name and you should be done. The Form will ask you for a source path (most likely an URL) which points to the remote repository and a destination path where to initialize the repository locally on your machine.

To do so, click on the Clone / New button (top-left corner), select the 'Clone Repository' tab.

Clone a Git repositoryĬreating a new local repository form a remote source in Sourchtree you have to clone a project. The first thing to do is to download and install SourceTree from their official page.

Sourcetree git flow how to#

Therefore the following chapter covers the basic task of Gitflow and how to perform them with the use of Sourcetree.

Sourcetree git flow for free#

SourceTree is a GUI for Git offered for free by Atlassian and it perfectly integrates Gitflow.