So I have been digging around for the best way to maintain a forked repo.
The issue with forked repos is keeping your branch in sync with upstream (repo you forked from) when you add commits. Trying to merge upstream to your repo can lead to merge conflicts, especially as commits pile up.
The current solution for this issue is
I want to make a gui version of git-imerge with more features to make it easier pull commit from upstream.
The most interesting part stays hidden.
I mean this:
idea is still pretty new. I am still researching on how to do this. Do you think the idea sounds reasonable?
Based on your post, I understand your idea as "Better git-merge".
That is a pretty generic description, so it's hard to say.