不知怎的,我遇到了这种情况:
我做的最后一件事是git rebase production/master
,以便能够推送到远程production
。
但是现在,我在master
和origin/master
中有重复的提交。
那么如果我尝试推送到origin/master
会发生什么,这些双重提交是否会出现在遥控器上?
有没有办法避免这种情况?
o [master] {production/master} redirect to admin dashboard
o hospital edit
o admin dashboard should be fine now
o single date select
o push to trigger post-receive hook
│ o {origin/master} redirect to admin dashboard
│ M─┐ Merge origin/master
│ │ o [feat/dashboard] admin dashboard should be fine now
│ │ o push to trigger post-receive hook
│ o │ hospital edit
│ o─┘ single date select
o─┘ font.css smallfix