Great! Notice how similar this is to fetching and merging at the same time? Well, that's exactly what git pull
does.
Might we need start with the remote followed by the remote branch we want to merge into the branch that we're currently on?
Psst: we shouldn't have any uncommitted local changes before we use git pull
.