I am trying to survive on my git knowledge when working on one-person projects but fail to understand exactly what the workflow for forked projects should be.

I forked https://github.com/jamesoff/simplemonitor to https://github.com/wsw70/simplemonitor to add some features. I somehow managed to issue a PR (example) in the past that was merged into the project.

I then started to work on a new feature. To this I have

• the monitor_remote_ssh branch in my code on my laptop …
• … synchronized with the Github fork

This is an ongoing work, everything is fine.

I then realized I would like to make another change in James’ code and ultimately issue a PR for that. To do so I would be working on a new branch (called dump_json_batch, for reference).

My question: where should I place this branch?

The current situation with the code is the following:

(please let me know if it would be better to provide a text-based git something)

There is the develop branch (Merge pull request #1382…) which I think is James’ develop branch on my laptop.
There is then an origin/develop branch a bit later (Merge pull request #1377…) which is his develop branch on GitHub (?) but not on my laptop (?). I did a pull, though, so I am not sure why it is dangling on its own (at least on the image).

Which commit should I checkout to work on the right place? The “right place” is, I think, the place where the simplemonitor development is today, so that I can start from the freshest possible place.

I hope the question is not too confusing – in short I do not understand why I have a develop branch and an origin/develop one and why they are not just one.