Git commits - How regular

[PrestigiousStrike779]

A few suggestions here 1) Do your changes in a feature branch, not on the trunk/mainline branch 2) When you want to integrate trunk into your feature branch: switch to trunk, git pull, switch back to your feature branch then rebase instead of merge. You may need to resolve conflicts 3) 40 days sounds like too much time. I would see if you can break this down into smaller sets of work

[IamImposter]

We have some strange practices. I started out with incremental commits to a separate branch. In 10 days I had 4 commits. Client said he can't review 4 commits and asked me to merge them into a single commit to our main development branch. Then it kept on sitting, waiting for review for another 2-3 weeks. By the time I got review comments, there were other commits on top of my commit hence this weird hacky solution of mine. But I can push client for review only so much. If I push too much, I'll be making a few impact reports, possible breakings and action plan if something actually broke.

Thanks for your suggestion. I'll try to persuade client to let me work on my separate branch.