If no one else has cloned or is working with branch1, you can rebase it on top of master, once you have updated master to upstream/master.
- First, fetch
upstream
(SmartGit: Remote/Pull, select "Fetch Only") - Then reset
master
toupstream/master
(SmartGit: Local/Reset) - Now rebase branch1 on top of master (SmartGit: In the
Branches
view, you can right-click on a branch likemaster
and selectRebase HEAD
to rebase your current HEAD onto the selected branchmaster
)
Resolve merge conflicts if necessary. - Finally push (force the push) of
branch1
toorigin
(SmartGit: In the context menu of theBranches
view, you can invokePush
andPush To
on local branches).