Whilst getting to grips with github, I was working in a single master branch only.
During my work, I’ve made several commits which cover the adding of a new feature to an application.
In between a few of these commits I’ve had other bug fixes to contend with.
My intention is to somehow merge the commits which all relate to this new feature into one commit “going-forward” so I can understand all of the changes which had to be made to get this new feature in place by looking at this one single commit rather than looking across the several I made prior.
I seem to be coming unstuck in that a) I didn’t create a new branch for this new feature (which I know I should have done, b) the commits don’t run concurrently so I can’t seem to easily merge them.
Is there a best practice I should do at this point to try and get this back to how I would like it, and also what ‘should’ have I done on the outset of this , so I understand how to get it right the next time I need to add something.
Many thanks for any replies.