Git: Squash commits older than conflicting merge

前端 未结 0 2036
时光取名叫无心
时光取名叫无心 2020-12-21 18:52

I would like to squash some commits that are older than a "conflicting" merge. E.g.:

main branch:  A--B--C--D--G--H
dev branch:    \\-E--F----/


        
相关标签:
回答
  • 消灭零回复
提交回复
热议问题