gistfile1.txt

 djp  ⋯  tmp  fork  taskwiki   master  git remote add tbabej https://github.com/tbabej/taskwiki.git
 djp  ⋯  tmp  fork  taskwiki   master  git pull tbabej master
remote: Counting objects: 566, done.
remote: Compressing objects: 100% (224/224), done.
remote: Total 566 (delta 361), reused 516 (delta 311), pack-reused 0
Receiving objects: 100% (566/566), 69.74 KiB, done.
Resolving deltas: 100% (361/361), completed with 8 local objects.
From https://github.com/tbabej/taskwiki
 * branch            master     -> FETCH_HEAD
Auto-merging doc/taskwiki.txt
CONFLICT (add/add): Merge conflict in doc/taskwiki.txt
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.