How can I rebase in git without resolving other commit conflicts, or squash all of my commits while leaving others' commits untouched?
问题 ---A--- / \ ---main-------- \---B---+A------/ \-----\--\C-? Above is roughly the situation on my team's repo. Feature A is a giant branch that I absolutely have to leave alone. I branched off of B but have been pulling from it periodically, which means that I have all of A's changes and am up to date with main on branch C. This also means that between my first and last commit on C, there are dozens of commits plus a giant merge from A. My repo requires that each push to main be squashed, and