check if pull merge yield conflicts, and save base, remote, local and orig
need CONFLICTING constant
add todo message about constants
need a repo
Merge branch 'master' of git@github.com:mikofski/JGit4MATLAB.git

Conflicts:
@JGit/pull.m