doing squash and merge is always creating new commit with new hash which make developers resolve conflict everytime they merge thier code in any branch, by doing it with commit and merge dev always have to resolve conflict only once after they can just merge and can be Happy!
How I Do..... steps
checkout from feature branch to env branch (dev, demo ,...)
doing squash and merge is always creating new commit with new hash which make developers resolve conflict everytime they merge thier code in any branch, by doing it with commit and merge dev always have to resolve conflict only once after they can just merge and can be Happy!
How I Do..... steps