+[2020-04-26T12:24:26Z]solsTiCeso as long as nobody works or commit to my remote branch, that will be fine if I git rebase -f ? +[2020-04-26T12:26:20Z]jhasssure. you can also just keep merging master into it +[2020-04-26T12:27:07Z]jhassthat'll allow anybody else working on that branch to just merge it +[2020-04-26T12:28:43Z]solsTiCeok +[2020-04-26T12:54:12Z]pat64Will GitHub Actions artifacts always be ZIP files? Or can I have another binary file directly available as an artifact, too?
i think it's a matter of pointing head to that commit
+[2020-04-27T19:35:30Z]fragtionHope 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. +[2020-04-27T19:36:06Z]fragtionI've tried squash HEAD~50 but I keep getting conflicts, or "tip of your current branch is behind" error, etc +[2020-04-27T19:37:24Z]jhassI mean, why bother? +[2020-04-27T19:37:31Z]fragtionIs 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:37:59Z]fragtionIt just looks pretty dumb to have so many commits for a few changes I made early on to the code :/