I&#x27;m <i>pulling</i> the changes you&#x27;ve made into my (upstream?) repository. It&#x27;s not the best name, but it makes sense. Maybe I&#x27;ve been using Git for too long.<p>I found fetch&#x2F;rebase&#x2F;merge to be more difficult to wrap my head around (and I still can&#x27;t do an interactive rebase&#x2F;squash)