Refresh a Branch from Master

James Foley June 2, 2015

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

2 votes
Answer accepted
Seth
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
June 3, 2015

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.

Tim Crall
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
June 3, 2015

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

James Foley June 3, 2015

Thanks Seth.

James Foley June 3, 2015

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
TAGS
AUG Leaders

Atlassian Community Events