Merge failed after executing mdk pull

[meirzamoodle]

Hi.

I work on Ubuntu, merge failed error happens every time pulling with MDK command below

▶ mdk pull MDL-1234 -t
...
Merging into current branch
FetchException: Merge failed, resolve the conflicts and commit

[FMCorz]

MDK cannot resolve git merges on its own. Once this command fails your repository will be in an unmerged state, you either need to manually abort the merge git merge --abort or resolve its conflicts.

[meirzamoodle]

The problem is there is no information on which files that conflicted

[FMCorz]

I'm afraid this is beyond the scope of what MDK can do. I'd suggest starting with git status.