You should get a fast-forward merge on that first step (syncing your fork with upstream). If not, you will run into problems.