-1
我该如何解决这个冲突? 我忘了做'git pull origin master',所以我得到了这个冲突。我怎样才能解决它,并用哪些命令?解决git的冲突
<<<<<<< HEAD
app.use('/ss/arabic', express.static(path.join(__dirname, 'views')));
app.use('/ss/english', express.static(path.join(__dirname, 'views')));
=======
app.get('/', function (req, res, next) {
res.redirect('/arabic');
});
app.use('/arabic', express.static(path.join(__dirname, 'views')));
app.use('/english', express.static(path.join(__dirname, 'views')));
>>>>>>> ceba0237b227d28795ce7f15d7ebddbe522ea4e2
[如何解决Git中的合并冲突?](http://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git) – 1615903