wb-gaoy@ALIPAY-38342W96 /E/git/cms (yonge3.0)
$ git pull
[email protected]'s password:
You asked me to pull without telling me which branch you
want to merge with, and 'branch.yonge3.0.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "yonge3.0"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
wb-gaoy@ALIPAY-38342W96 /E/git/cms (yonge3.0)
$ git config branch.yonge3.0.remote origin
wb-gaoy@ALIPAY-38342W96 /E/git/cms (yonge3.0)
$ git config branch.yonge3.0.merge refs/heads/yonge3.0
wb-gaoy@ALIPAY-38342W96 /E/git/cms (yonge3.0)
$ git pull
[email protected]'s password:
Updating 9048d45..9c551cd
Fast-forward
.../ecmng/impl/cache/RefreshServerMember.java | 41 -------
.../main/resources/META-INF/spring/biz-daemon.xml | 24 ----
.../main/resources/META-INF/spring/biz-shared.xml | 8 +-
.../com/alipay/easycms/distribute/Hazelcast.java | 28 -----
.../easycms/distribute/HazelcastFactory.java | 58 ++++++++---
.../easycms/sync/DistributedTaskLockManager.java | 9 +-
.../sync/SvnPlatformTransactionManager.java | 116 --------------------
.../com/alipay/easycms/hazelcast/LockTest.java | 12 +--
8 files changed, 60 insertions(+), 236 deletions(-)
delete mode 100644 app/biz/shared/src/main/java/com/alipay/ecmng/impl/cache/Ref
reshServerMember.java
delete mode 100644 app/easycms/src/main/java/com/alipay/easycms/distribute/Haze
lcast.java
delete mode 100644 app/easycms/src/main/java/com/alipay/easycms/sync/SvnPlatfor
mTransactionManager.java
wb-gaoy@ALIPAY-38342W96 /E/git/cms (yonge3.0)
$