Fix: Git reconciliation preference (#98)

Specifies a git preference for merging when there is difference between branches/projects

src/js/gitnative.js

@@ -4,6 +4,9 @@ var path = require('path'),
     utils = require('../js/lib/utils'),
     cmdr = require('../js/lib/cmdr');
 
+const ALLOW_UNRELATED_HISTORIES = '--allow-unrelated-histories';
+const NO_REBASE = '--rebase=false';
+
 // NOTE: could use moment module for this
 function createTagName(datetime) {
     return 'R2P/' +
@@ -138,15 +141,14 @@ function GitManager() {
                     return mythis.getVersion();
                 })
                 .then(function (version) {
-                    var diff = cmd().cd(localPath).and.do('git diff --name-only --diff-filter=U');
-                    var pull = "";
-
+                    const diff = cmd().cd(localPath).and.do('git diff --name-only --diff-filter=U');
+                    let pullCommand = `git pull "${remotePath}" master ${NO_REBASE}`;
+                    
                     if (version.major > 2 || (version.major == 2 && version.minor > 8)) {
-                        pull = cmd().cd(localPath).and.do(`git pull "${remotePath}" master --allow-unrelated-histories`);
-                    } else {
-                        pull = cmd().cd(localPath).and.do(`git pull "${remotePath}" master`);
+                        pullCommand += ` ${ALLOW_UNRELATED_HISTORIES}`;
                     }
-
+
+                    const pull = cmd().cd(localPath).and.do(pullCommand);
                     return pull.run()
                         .catch(function (err) {
                             if (err.stdout.includes('fix conflicts')) {
@@ -182,7 +184,11 @@ function GitManager() {
                     return mythis.commitAll(user, localPath);
                 })
                 .catch(function (err) {
-                    throw "Error while merging projects: " + err.stderr;
+                    if (err.stderr != undefined) {
+                        throw "Error while merging projects: " + err.stderr;
+                    } else {
+                        console.error(err);
+                    }
                 })
                 .then(utils.logr("Finished merging"))
                 .then(function () {