Git Rebase Replays Each Commit, Multiplying Merge Conflicts on August 06, 2026 git merge conflicts git rebase Trending version control workflows +