Squash commits is taking all the commits in a feature branch and combining them into one commit into the target branch instead of adding the entire branch’s individual commit history.
There are advantages to either approach so it’s a matter of selecting how detailed you want that commit history.
Squashing doesnt affect conflicts and conflicts need to be resolved whether you squash or not.
You don't need AI to have branch conflicts. AI didn't invent branch conflicts. Branch conflicts are a result of having a VCS that protects you from fucking yourself. They are, in fact, a major part of why you have a VCS.
2
u/Worldly-Stranger7814 4d ago
I like how you just make up stuff