Commit e1fc3c7
John Haley
Fixed broken promise chain in pull example
1 parent c82343c commit e1fc3c7
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,7 @@ nodegit.Repository.open(path.resolve(__dirname, repoDir)) | |||
| 19 | 19 | // Now that we're finished fetching, go ahead and merge our local branch | |
| 20 | 20 | // with the new one | |
| 21 | 21 | .then(function() { | |
| 22 | - repository.mergeBranches("master", "origin/master"); | ||
| 22 | + return repository.mergeBranches("master", "origin/master"); | ||
| 23 | 23 | }) | |
| 24 | 24 | .done(function() { | |
| 25 | 25 | console.log("Done!"); | |
0 commit comments