Background

I attempted to manually fix a problem in the first post in this series half a year ago.

Problem

I have just updated the Jekyll source code for Blog 2.

[owner@localhost ~/blog2]$ git pull jekyll master
remote: Counting objects: 37, done.
remote: Total 37 (delta 10), reused 10 (delta 10), pack-reused 27
Unpacking objects: 100% (37/37), done.
From github.com:plusjade/jekyll-bootstrap
 * branch            master     -> FETCH_HEAD
   3a34785..8193869  master     -> jekyll/master
Removing sitemap.txt
Auto-merging _includes/JB/setup
CONFLICT (content): Merge conflict in _includes/JB/setup
Auto-merging _config.yml
Automatic merge failed; fix conflicts and then commit the result.

How to repair this failed merge?

Solution

In the file _includes/JB/setup, I deleted the HEAD part, and adopted the official changes in the remote repository for Jekyll. Then, everything should be fine.