トラブル解消だよね
pushしようとすると[rejected]となる場合、pull(merge)してみる。
801> git push
To https://github.com/externvoid/externvoid.github.io.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/externvoid/externvoid.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
806> git pull
fatal: refusing to merge unrelated histories
807> git merge --allow-unrelated-histories origin/master
Auto-merging _config.yml
CONFLICT (add/add): Merge conflict in _config.yml
Automatic merge failed; fix conflicts and then commit the result.
808> !v
811> git add _config.yml
812> git cm -m "fix conflict"
[master dce4081] fix conflict
813> git push
Enumerating objects: 151, done.
Counting objects: 100% (151/151), done.
Delta compression using up to 8 threads
Compressing objects: 100% (147/147), done.
Writing objects: 100% (149/149), 4.41 MiB | 2.24 MiB/s, done.
Total 149 (delta 5), reused 0 (delta 0)
remote: Resolving deltas: 100% (5/5), done.
To https://github.com/externvoid/externvoid.github.io.git
4ed8a18..dce4081 master -> master
Jekyll also offers powerful support for code snippets:
def print_hi(name)
puts "Hi, #{name}"
end
print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.Check out the Jekyll docs for more info on how to get the most out of Jekyll. File all bugs/feature requests at Jekyll’s GitHub repo. If you have questions, you can ask them on Jekyll Talk.