have you looked into squash commit merge. Basically you do the same workflow as you are doing now, just squash it to a single commit so that wherever is your

have you looked into squash commit merge. Basically you do the same workflow as you are doing now, just squash it to a single commit so that wherever is your last commit stays. if needed you can go to your branch for history https://stackoverflow.com/questions/5308816/how-can-i-merge-multiple-commits-onto-another-branch-as-a-single-squashed-commit https://stackoverflow.com/questions/5308816/how-can-i-merge-...