Pulling non-active branch in Sourcetree (or GIT)

We are quite new to GIT and Sourcetree, and things are going pretty well.  Unfortunately for me, I have become one of the go-to guys for when new team members come onboard.

We have a process workflow that works well, but I keep thinking there may be a better (quicker/simpler) way to update feature branches.


Specifically:    We never work on develop itself, every bit of work however small is done on it's own branch, and a pull request enforced for merging back to develop (all good so far).


The problem arises when other developers have updated our develop branch, we encourage everyone to update their own feature branches often, and the sequence we show them is:

 

  • Switch to Develop
  • Pull Changes
  • Switch back to their branch
  • Merge develop into their branch to update it.

 

Is there a way to achieve this in Sourcetree without having to switch branches?


Many thanks.

4 answers

1 accepted

This widget could not be displayed.

If you want to stay in SourceTree, you can do a fetch (doesn't matter what branch is checked out), then merge directly from the remote develop branch by expanding the >Remotes branch list, and right clicking on that develop (probably origin/develop).

The Pull operation currently performs a Fetch for you, so you'll want to make sure you do this manually since you're using Merge instead of Pull.

+1 for this, I teach our developers to stay in the feature branch, pull/fetch, merge origin/develop into the feature branch and push the merge. Also, most of the time it makes no difference whether they merge often, unless you have a small codebase with many developers. So I would not tell them to merge often.

Many thanks. Just tried this and it does what I expect. Will talk with our new to GIT developers and show the m this method.

This widget could not be displayed.

I'm a CLI guy too, and I'd recommend your guys become so too if possible...

As well as what Chris says, we all use "git up", or for windows, which will update all your branches, including stashing changes if necessary, and rebasing your feature branch if you are sharing it.

Then generally we rebase our feature branch ("git rebase develop") on top of develop/master, which keeps things nice and clear.

Shameless plug: I wrote a few notes about how we improved our PR process here: http://www.adaptavist.com/w/inside-adaptavists-stash-pull-request-workflow/. What's not in that, I don't think, is we use an event handler to stop people create PRs until they have merged/rebased. This gives us the best likelihood that when people come to review it won't already be conflicted, and that the build will be the same as the one done when merged.

 

This widget could not be displayed.
Chris Fuller Atlassian Team Jun 29, 2015

I'm a command line guy, so I can't really help you with source tree, but...

git fetch origin develop:develop

is how I would normally do this.

Hmm, not sure either CLI or installing a different GIT are going to cut it with other developers in our company....

 

Many are CLI-phobics smile

 

This widget could not be displayed.

I personally prefer to do this in command line too.

There are couple more options in merge within sourcetree -

  1. In "merge from log" tab, select jumpto and select your remote branch and merge it to your current branch.
  2. if you have already fetched the remote branch, mac version has "Merge fetched" tab, that allows you to merge the fetched branch without switching to the branch. I don't thinkj this is available in windows version.  

 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

874 views 2 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you