node-ci / nci

Flexible, open source continuous integration server written in node.js
Other
132 stars 26 forks source link

Fix git pull operation #18

Closed Smert closed 8 years ago

Smert commented 8 years ago

git pull in NCI create Merge branch 'develop' of ... commits if branch been rebased. These unnecessary merge commits can interfere with build scripts

fleg commented 8 years ago

Thank you for contribution, but --rebase will not help in this case, because it still merge branches, I'm currently working on it (replacing pull by fetch + reset)

Smert commented 8 years ago

Yes. It is right :)