How to work with the github fork in this case?

Question

git

In general, there is a repository on github with a library. Periodically, the developer makes a release with a stable version, but before that, all changes are made in the master branch. For work, the latest available release is naturally taken. So, it was necessary to make some changes in the last release (after the release there were already many commits with edits from the author). For this, a fork of the repository was created. But how to work with it, I can not understand something. In order for me to make changes to a certain release, do I need to create a new branch from the commit with this release, or is it possible / necessary to work with the fork in some other way, so that I can then pull up the new release that will be released later without any problems?

Answer 1

Make your branch from the latest release commit. When a new author's release comes out, it will rebase your branch to a new commit. But, of course, no one will give you any guarantees that there will be no conflicts. When the author changes the same code as in your branch, there will be a conflict.