小编Gon*_*alo的帖子

我发现了特拉维斯CI的几个问题,我一直在解决它们,但最后一个我不能解决它们.

我遇到了常见的错误 com.android.ddmlib.InstallException: Failed to establish session

这是我的travis文件:

language: android

before_install:
 - chmod +x gradlew

android:
  components:
    # Uncomment the lines below if you want to
    # use the latest revision of Android SDK Tools
    # - platform-tools
    # - tools

    # The BuildTools version used by your project
    - tools
    - build-tools-23.0.3

    # Additional components
    - extra-google-m2repository
    - extra-android-m2repository

    # The SDK version used to compile your project
    - android-23

    # Specify at least one system image,
    # if …

我遇到了git的问题.我想hotfix在master本地和远程两个地方重新分支一个分支,所以这就是我所做的.

git checkout hotfix
git pull hotfix              #just getting someone changes
git fetch origin master
git rebase origin/master

经过很长一段时间解决冲突和重建项目后,我的工作正常,所以我必须将更改上传到远程分支.

git push origin hotfix

这就是git认为:

$ git push origin login2
To https://name@bitbucket.org/***/***.git
 ! [rejected]        hotfix -> hotfix (non-fast-forward)
error: failed to push some refs to 'https://name@bitbucket.org/***/***.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See …