latest 5 messages by fragtion
+
[2020-04-27T19:38:09Z]
fragtion
fair enough
+
[2020-04-27T19:37:59Z]
fragtion
It just looks pretty dumb to have so many commits for a few changes I made early on to the code :/
+
[2020-04-27T19:37:31Z]
fragtion
Is there any way to reset the fork to author's code and then push only my changes, consolidated together as a single commit ahead of the author's ?
+
[2020-04-27T19:36:06Z]
fragtion
I've tried squash HEAD~50 but I keep getting conflicts, or "tip of your current branch is behind" error, etc
+
[2020-04-27T19:35:30Z]
fragtion
Hope someone can help. I forked a repo on github and have made some changes over time to master branch. I regularly pull/merge from author's repo to keep my fork up to date. I'm now over 50 commits ahead of the author's repo even though I've only made a few changes to my fork. I want to reduce all of those those "commits" into a single one of my changes, without recreating my whole fork.