develop branch
--> dashboard (working branch)
我git merge --no-ff develop
用来将任何上游更改合并到仪表板中
混帐日志:
commit 88113a64a21bf8a51409ee2a1321442fd08db705
Merge: 981bc20 888a557
Author: XXXX <>
Date: Mon Jul 30 08:16:46 2012 -0500
Merge branch 'develop' into dashboard
commit 888a5572428a372f15a52106b8d74ff910493f01
Author: root <root@magneto.giveforward.com>
Date: Sun Jul 29 10:49:21 2012 -0500
fixed end date edit display to have leading 0
commit 167ad941726c876349bfa445873bdcd475eb8cd8
Author: XXXX <>
Date: Sun Jul 29 09:13:24 2012 -0500
合并中有大约 50 多个提交,我想知道如何恢复合并,以便仪表板回到合并前的状态
第二部分是,如果我不与 合并--no-ff
,我不会得到提交'合并分支'开发'到仪表板'..我将如何回滚该合并?