Skip to content

Commit 0aca4ca

Browse files
committed
[Issue #28] - App isn't merged without -f
1 parent 012e3f0 commit 0aca4ca

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
### Fixes
66

7+
- [Issue #28] - App isn't merged without -f
8+
79
## [0.2.1] - 2018-03-29
810

911
### Additions

lib/chainlinks/builder.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,14 @@ let Builder = function() {
8282

8383
}
8484
else {
85-
accept(payload);
85+
86+
// Merge build
87+
if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
88+
accept(payload);
89+
}
90+
else {
91+
reject("Could not merge");
92+
}
8693
}
8794

8895
});

0 commit comments

Comments
 (0)