Git workflow: forking a project and maintaing a local modified copy, but keep up to date

Question

I\'m trying to figure out the best workflow for maintaining a local copy of a github-hosted project (moodle) with customizations, while maintaining the ability to keep our copy

Answer 1

Yes, it makes sense. Although step #4 can be slightly simplified to git checkout master && git pull --ff-only upstream master.

The --ff-only ensures that you don't get any merge commits in your pristine copy.