Some Merge-Errors I stumbled upon.

- if remote <code>master</code> and local <code>master</code> were different and needed to be merged, ungit always said it was up to date.

- if remote and local tried both to add the same file you could not resolve the conflict