conflict 11 git 9 file 7 name 6 merge 5 files 5 javascript 5 nodejs 5 npm 5 filepath 4 vinyl 4 package 4 node 4 gulp 4 plugin 4 detect 3 cli 3 info 3 fs 3 gulpplugin 3 path 3 jonschlinkert 3 check 3 stream 3 what-the-hell-just-happened 2 upstream-sync 2 up 2 unreleased 2 unpushed 2 submodule-rm 2 undo 2 undo-push 2 undelete 2 trail 2 switch-branch 2 tag-and-sign 2 tag-diff 2 thanks 2 track 2 rename 2 changelog 2 bulk 2 brv 2 browse 2 archive-file 2 alias 2 work-in-progress 2 roots 2 fetch-pull-requests 2 ahead-of-master 2 wtf 2 wordiness 2 winner 2 whoami 2 where 2 when-merged 2 stats 2 recently-checkedout-branches 2 recent 2 rebase-theirs 2 rebase-authors 2 rank-contributors 2 pylint 2 purge-from-history 2 publish 2 pruneall 2 prune-branches 2 promote 2 plotrepo 2 pie-ify 2 overwritten 2 outgoing 2 checkout 2 sr 2 sp 2 shrink-repo 2 show-overwritten 2 shamend 2 run-command-on-revisions 2 root-directory 2 rm-deleted-from-repo 2 reup 2 restore-mtime 2 reset-with-fire 2 rename-branches 2 remote-default-branch 2 related 2 rel 2 ref-recent 2 show-tree 2 show-merged-branches 2 setup 2 sed 2 scp 2 root 2 reset-file 2 repl 2 rename-tag 2 rename-remote 2 rename-branch 2