- I have a fork of another repo @github.
- did some code and issued a pull request to upstream
- upstream master merged with squash option
- now next pull request includes new code and the older commits as well. So they increasingly pile up.
What can I do with it?
- repos are completely in sync in terms of code
- still github badge at the top shows that my fork is xx commits ahead of the upstream
- I tried to merge upstream to my repo (with no effect because they are sync)
- I'm not sure if rebase may help, but there are my commits and other people's commits. So it is a mess there and I'm not sure what to rebase.