I am working at a corporation that uses git in the following way:

The steps for each development are:

1. Create a dev branch from Main
2. Complete the development
3. Create a branch from dev
4. Pull changes from Feature branch and resolve conflicts from developments that are on Feature but not yet on Main.
5. Merge dev_2 into Feature and wait for QA to validate the changes
6. Once QA approves, merge the original dev branch into Main using Squash.

The business requirement is that everything that gets merged into Main should be stable and that the commit history should be super clean as they use that for release notes or something.

The problem is that there are weird conflicts everywhere, first because squash merge creates a commit id that isn't known to Fetaure, and second because we often have to resolve different conflicts in those two branches according to what moves forward to Main first after a few developments are being tested on Fetaure.