Re: git bug - merging JS / Node.js code with "git merge --squash"

Alexander Mills writes: > basically it is doing the merge with this line: > > git merge --squash -Xtheirs dev -m "squashing" && The order of command line parameters are "dashed options and their arguments first, then refs (and then pathspecs if exists), so you

git bug - merging JS / Node.js code with "git merge --squash"

@git-community I am on Git git version 2.7.4 This problem is happening on Ubuntu 16.04, but the same problem was also happening when I was running on MacOS. I am consistently seeing merge bugs, when merging between branches of a mostly Node.js project. I am seeing fairly bad merges that mangle