Javascript 网页包：您可能需要适当的加载程序来处理此文件类型

我有一个小nodejs项目与网页包。我对webpack比较陌生，所以我认为这就是问题所在

如果我安装log4js、winston或其他日志库并运行我得到的应用程序

WARNING in ./~/log4js/lib/log4js.js
Critical dependencies:
388:21-38 the request of a dependency is an expression
 @ ./~/log4js/lib/log4js.js 388:21-38

WARNING in ./~/log4js/lib/appenders/logstashUDP.js.orig
Module parse failed: /Users/me/Development/jstemplate/node_modules/log4js/lib/appenders/logstashUDP.js.orig Line 31: Unexpected token <<
You may need an appropriate loader to handle this file type.
| 
|     var logObject = {
| <<<<<<< HEAD
|       '@timestamp': (new Date(loggingEvent.startTime)).toISOString(),
|       type: type,
 @ ./~/log4js/lib/appenders ^\.\/.*$

---

打开此文件。它被破坏了

    var logObject = {
<<<<<<< HEAD
      '@timestamp': (new Date(loggingEvent.startTime)).toISOString(),
      type: type,
      message: logMessage,
      fields: fields,
      category: loggingEvent.logger.category
=======
      "@version" : "1",
      "@timestamp" : (new Date(loggingEvent.startTime)).toISOString(),
      "type" : config.logType ? config.logType : config.category,
      "message" : layout(loggingEvent),
      "fields" : _.extend(config.fields,
                    loggingEvent.data.length > 1 ? loggingEvent.data[1] : {},
                    {'level':loggingEvent.level.levelStr})
>>>>>>> jumpgh-master
    };

var logObject={
>>跳高大师
};

---

看起来像是合并冲突。似乎此模块有问题，而不是网页包有问题。

打开此文件。它被破坏了

    var logObject = {
<<<<<<< HEAD
      '@timestamp': (new Date(loggingEvent.startTime)).toISOString(),
      type: type,
      message: logMessage,
      fields: fields,
      category: loggingEvent.logger.category
=======
      "@version" : "1",
      "@timestamp" : (new Date(loggingEvent.startTime)).toISOString(),
      "type" : config.logType ? config.logType : config.category,
      "message" : layout(loggingEvent),
      "fields" : _.extend(config.fields,
                    loggingEvent.data.length > 1 ? loggingEvent.data[1] : {},
                    {'level':loggingEvent.level.levelStr})
>>>>>>> jumpgh-master
    };

var logObject={
>>跳高大师
};

看起来像是合并冲突。看起来此模块有问题，而不是网页包