Yes, I’ve had the same problem where I fix a branch but then I can’t remove the commit that fixed the branch! Sometimes git gets really complicated. That’s why I went with the “nuclear option” a few times - delete and fork again.
When you do that, you destroy everything, except what was already merged by SalesAgility. So, to spell it out in parts:
-
PR’s you made in the past and were merged in salesagility/SuiteCRM, these are ok, no problem
-
PR’s you made in the past but are still waiting to be merged - big problem, you will mess these up if you delete your fork
-
fix you are currently working on so you can create a new PR: you lose this too.
So when I deleted my fork I had no pending PR’s, and I kept my current code elsewhere (normally these were simple fixes) and I had to do the commits (or edit the files) again before creating the definitive PR.
About the command-line, I did spend countless hours in the past weeks climbing the steep learning curve of git (with partial success). We can try and work out the commands together here. These things are tough, but once they’re done, they are of generic use to many people in the community. I’ll try to work on a script and post it here soon.