Open adhikasp opened 7 years ago
@rultor merge
@rultor merge
@adhikasp OK, I'll try to merge now. You can check the progress of the merge here
@rultor merge
@adhikasp Oops, I failed. You can see the full log here (spent 1min)
edited: super long log files
@rultor merge
@rultor merge
@adhikasp OK, I'll try to merge now. You can check the progress of the merge here
-
@rultor merge
@rultor merge
@adhikasp OK, I'll try to merge now. You can check the progress of the merge here
@rultor merge
@adhikasp Oops, I failed. You can see the full log here (spent 10s)
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:blibli-future/detroit.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z '' ']'
+ '[' -e pom.xml ']'
+ scripts=('mvn clean test')
+ echo 'pom.xml is here, I guess it is Apache Maven'
pom.xml is here, I guess it is Apache Maven
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'mvn clean test'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:blibli-future/detroit.git
+ git remote update
Fetching origin
Fetching fork
From github.com:blibli-future/detroit
* [new branch] develop -> fork/develop
* [new branch] feature/migrate-to-dto -> fork/feature/migrate-to-dto
* [new branch] feature/travis -> fork/feature/travis
* [new branch] feature/unit-testing -> fork/feature/unit-testing
* [new branch] http-basic-auth -> fork/http-basic-auth
* [new branch] master -> fork/master
* [new branch] rename-package -> fork/rename-package
* [new branch] rultor -> fork/rultor
+ args=
+ '[' '' == default ']'
+ '[' '' == no ']'
+ '[' '' == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/rename-package
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch rename-package from fork.
+ git checkout -B develop origin/develop
Switched to a new branch 'develop'
Branch develop set up to track remote branch develop from origin.
+ '[' '' == true ']'
+ '[' '' == true ']'
+ git merge __rultor
Auto-merging src/main/java/com/blibli/future/detroit/model/exception/WeightPercentageNotValid.java
Auto-merging .rultor.yml
CONFLICT (add/add): Merge conflict in .rultor.yml
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly
@rultor merge
@rultor merge
@adhikasp OK, I'll try to merge now. You can check the progress of the merge here
@rultor merge
@adhikasp Oops, I failed. You can see the full log here (spent 1min)
Found the problem, rultor only can merge on master
branch, but we want to use develop
. This automatic merge thing is blocked 👎
Fixes https://github.com/blibli-future/detroit/issues/30