There is an open source project that I'd like to fork for various reasons. The upstream project uses SVN for source code management, but they maintain a read-only Git mirror on GitHub.
I want to take the project on Github and fork it on to Gitlab. One of the most important aspects that I want to be able to do is to merge upstream patches into my fork, but I'm unsure of the best way to go about that? Should I have the master branch track the head branch of the SVN repository and then do all of my development work in a Git branch?
The license the upstream project uses doesn't require changes to be committed back to the main project, but I'd like to keep that option open if possible since I think my changes might appeal to some people in the future once I've tested them on my fork.
I'm just slightly confused about the best way to make sure that I can apply upstream patches to my fork and to make sure that I can merge my changes back to the original project as well if that ever became an option.