How can I rebase in git without resolving other commit conflicts, or squash all of my commits while leaving others' commits untouched?

Question

 ---A---
/       \\
---main--------
  \\---B---+A------/
       \\-----\\--\\C-?

Above is roughly the situation on my team\'s repo. Feature A is a g