akshayrao14 / git-practices

The latest version of best practices for git
0 stars 1 forks source link

Use commit merge in merge_into.sh instead of squash and merge #3

Closed Yogesh-K-Tern closed 1 day ago

Yogesh-K-Tern commented 1 month ago

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

akshayrao14 commented 1 month ago

accepted

akshayrao14 commented 1 day ago

Handled in #9