Administrator@PC-20180628YVEL MINGW64 /e/IvenSpace/IDownLoad (master)
$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> master
Administrator@PC-20180628YVEL MINGW64 /e/IvenSpace/IDownLoad (master)
$ git branch --set-upstream-to=origin/master master
Branch 'master' set up to track remote branch 'master' from 'origin'.
Administrator@PC-20180628YVEL MINGW64 /e/IvenSpace/IDownLoad (master)
$ git pull
fatal: refusing to merge unrelated histories
Administrator@PC-20180628YVEL MINGW64 /e/IvenSpace/IDownLoad (master)
$ git pull origin master --allow-unrelated-histories
From github.com:IvenOne/IDL
* branch master -> FETCH_HEAD
Merge made by the 'recursive' strategy.
README.md | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 README.md
Annotation processors must be explicitly declared now. The following dependencies on the compile classpath are found to contain annotation processor. Please add them to the annotationProcessor configuration.
- realm-android-0.87.5.jar (io.realm:realm-android:0.87.5)
Alternatively, set android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true to continue with previous behavior. Note that this option is deprecated and will be removed in the future.
See https://developer.android.com/r/tools/annotation-processor-error-message.html for more details.