Github user nikhilkh commented on a diff in the pull request:
https://github.com/apache/cordova-coho/pull/78#discussion_r30698765
--- Diff: src/repo-update.js ---
@@ -129,8 +129,9 @@ function *updateRepos(repos, branches, noFetch) {
yield gitutil.gitCheckout(branchName);
var ret = yield
executil.execHelper(executil.ARGS('git merge --ff-only', repo.remoteName + '/'
+ branchName), false, true);
if (ret === null) {
- ret = yield
executil.execHelper(executil.ARGS('git rebase ' + repo.remoteName + '/' +
branchName), false, true);
- if (ret === null) {
+ try {
+ ret = yield
executil.execHelper(executil.ARGS('git rebase ' + repo.remoteName + '/' +
branchName), false, true);
--- End diff --
Fixed
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
