nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Refresh a Branch from Master

James Foley1

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

Accepted answers

Seth

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.

All comments

Seth

Tim Crall1

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

James Foley1

Thanks Seth.

James Foley1

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.