Support for forks with custom commits

[fragtion]

This tool is awesome for keeping an unmodified fork up to date, thanks for creating it

However if I've made some changes to an originally forked repo, then it doesn't seem to support that. I guess that is understandable as unresolved conflicts could arise

In my case, I often create a fork for the purpose of divergent development, make only a few changes, and then want to keep the rest of the base code in sync with the original author's repo as "automatically" as possible. This is conceptually in contrast to the fork being a temporary vessel for making changes for the sake of ultimately contributing any changes via a pull request to the original repo

Could it be made to support such scenarios, provided that there are no conflicts caused/detected by any customizations? Assuming that it detects conflicts, it could advise the user to deal with those manually. Perhaps later down the line, it could be expanded to deal with such conflicts via the Web UI as well?

I feel that would drastically increase practical usability of the tool and expand the scope of its possible use cases. Thoughts?

[alexivkin]

Makes total sense, I do the same "divergent dev", but I am not sure how to implement it correctly. To branch the fork into a master that is tracking the original master, while keeping changes in a separate branch? Or wait for the original to merge the pull request and then fast-forward? Or something else?