You can `pull -r` immediately before pushing. Conveniently, you can configure pull to autorebase. Either way, the simplest modification to your last step is this:
git pull -r && git push On 10/31/2016 05:01 PM, Eric A. Borisch wrote: > Thanks for all the hard work with this transition! I'm sure once we're > all "over the hump" we'll look back and wonder why we waited so long. > > Just so I'm clear on this, is the desired approach for each committer to: > > == setup == > 1) clone macports/macports-ports to the local filesystem > == every change == > 2) make changes > 3) 'add' changes > 4) 'commit' changes > 5) 'push' changes (to macports-ports) > > Oh, and and to capture upstream changes, somewhere after 1 and before 5 > (4? 3?), > > a) git fetch > b) git rebase origin/master > It looks like git pull --rebase does both of those, so that's not too bad. > > If I'm wrong, or if I've missed something, please let me know; there's > been more discussion than I've had time to follow of late surrounding > this transition... > _______________________________________________ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev