I would use the rebase method. Mostly because it perfectly reflects your case semantically, ie. what you want to do is to refresh the state of your current branch and "pretend" as if it was based on the latest.
So, without even checking out master
, I would:
git fetch origin
git rebase -i origin/master
# ...solve possible conflicts here
Of course, just fetching from origin does not refresh the local state of your master
(as it does not perform a merge), but it is perfectly ok for our purpose - we want to avoid switching around, for the sake of saving time.