Refresh a Branch from Master

We have a project that created a branch for a future release of the product, but work continued in the master. Now we would like to update the branch with changes made in the master, but without merging our branch changes int the master as we aren't ready for that step just yet.

Is this possible in SourceTree, and if so how?

thanks

1 answer

1 accepted

This widget could not be displayed.

The merge operation is one-way, not two-way. If you check out the release branch, then merge from master, the master branch won't be modified, and the release branch will get all the changes that have been made to master.

That's correct - but this also may be a situation to think about using a rebase instead.

Thanks Tim, just read up on rebase but I think its a bit more than we need at the moment, but thanks for pointing it out, as it may well be useful in the future.

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...

879 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