In my proposition, the flow:
1. commit 2. squash commits to a meaningful commit 3. merge
would become:
1. code 2. merge with a meaningful commit
1. commit 2. squash commits to a meaningful commit 3. merge
would become:
1. code 2. merge with a meaningful commit