1
我有这个分支:Git会询问我拉,每次我要推到我自己的分支
地方:
bugfix/VMS-172-back-arrow-on-activity-bar
远程:
origin/bugfix/VMS-172-back-arrow-on-activity-bar
所以我添加本地我的变化然后推它。
然后我再次在本地做了一些改动,我推了它(我在提交时使用git commit --amend
)。但是这次git让我在推之前拉。为什么?
我的git的日志:
commit f38a4d8828a2fadec3c62c08cc1c90ea66a719bd
Merge: 172968f 642178d
Author: degensharew <[email protected]>
Date: Thu Oct 15 09:45:59 2015 +0300
Merge branch 'bugfix/VMS-172-back-arrow-on-activity-bar'
of myrepository into bugfix/VMS-172-back-arrow-on-activity-bar
Conflicts:
vms-mobile/app/src/main/java/AbstractActivity.java
commit 172968f6dcf533e43749986eba95a008c585bbb1
Author: degensharew <[email protected]>
Date: Wed Oct 14 17:21:01 2015 +0300
Fixed bug VMS-172.
Avoided rounded corner style from search view.
Style back arrow and title of action bar view.
Disabled 'back action' from activity title.
commit 642178d27bccbe9ea48c7d8ae123f1c8c01f921f
Author: degensharew <[email protected]>
Date: Wed Oct 14 17:21:01 2015 +0300
Fixed bug VMS-172.
Avoided rounded corner style from search view.
Style back arrow and title of action bar view.
Disabled 'back action' from activity title.
NB:我是唯一一个在这个分支上工作。
谢谢,干净的答案。 – dsharew