branchforge
Advanced tools
Comparing version 0.7.0 to 0.8.0
@@ -99,5 +99,9 @@ #!/usr/bin/env node | ||
yield this.git.checkout(base); | ||
// Create the new branch from base | ||
yield this.git.checkoutLocalBranch(branchName); | ||
// Merge the include branches | ||
for (const include of includes) { | ||
yield this.git.merge([include]); | ||
// Check if the include branch exists remotely | ||
const includeBranch = (yield this.branchExists(include)) ? include : `origin/${include}`; | ||
yield this.git.merge([includeBranch]); | ||
} | ||
@@ -104,0 +108,0 @@ console.log(`Branch "${branchName}" has been rebuilt.`); |
{ | ||
"name": "branchforge", | ||
"version": "0.7.0", | ||
"version": "0.8.0", | ||
"private": false, | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
11186
241