...
This is probably basically what your branch history looks like in this scenario:
| Code Block |
|---|
A---B---C develop |
...
\ |
...
D---E upstream/develop |
The problem here, is that if you simply do a git pull to merge in the upstream changes, you'll get an extra commit, and if git resolves merge conflicts the wrong way you could potentially end up committing changes that undo whatever work occurred upstream. So instead what you want to do is this:
...
This should result in your history looking like this:
| Code Block |
|---|
A---B---D---E |
...
upstream/develop |
...
\ |
...
C' develop |
Now move on to Sharing Your Changes
...
That is if we have commits:
...
| Code Block |
|---|
A---B---C---D---E--- |
...
F |
and upstream/master points to F, then develop points to any of A through E. Similarly, your feature branch can be based off of any commit on the develop branch (before or after your local develop).
Now you do
# You can skip this if you're already no the develop branch
...