Merge Conflicts break syncing (git storage)

[sj14]

Describe the bug
When the bi-directional git syncing is activated and a merge conflict occurs (someone is editing the same line in git and someone in wikijs), the pull from wikijs will fail with a merge conflict and thus the syncing will stop from this point on as long as no manual action to solve this conflict was done.

To Reproduce
Steps to reproduce the behavior:

1. Activate Bi-directional sync in the git storage options.
2. Change and push a file directly to your git repository defined in the storage options...
3. ...before the next sync happens, change the same line of the same file with wikijs.
4. Wait for the next sync, triggered by wikijs

Expected behavior
I would like to have an option to solve this conflict without manual intervention. Such as always using the current state from the local wiki repo and discarding the other changes.

Logs

2020-06-03T08:37:03.104Z [MASTER] info: (STORAGE/GIT) Committing updated file [en] test-page...
2020-06-03T08:39:09.795Z [MASTER] info: Syncing with storage target git...
2020-06-03T08:39:09.867Z [MASTER] info: (STORAGE/GIT) Performing pull rebase from origin on branch master...
From [REPO URI]
 * branch            master     -> FETCH_HEAD
   cc7677b..8cdef83  master     -> origin/master
2020-06-03T08:39:10.155Z [MASTER] error: Syncing with storage target git: [ FAILED ]
2020-06-03T08:39:10.156Z [MASTER] error: From [REPO URI]
 * branch            master     -> FETCH_HEAD
   cc7677b..8cdef83  master     -> origin/master
2020-06-03T08:41:24.649Z [MASTER] info: Purging orphaned upload files...
2020-06-03T08:41:24.652Z [MASTER] info: Purging orphaned upload files: [ COMPLETED ]
2020-06-03T08:44:10.186Z [MASTER] info: Syncing with storage target git...
2020-06-03T08:44:10.211Z [MASTER] info: (STORAGE/GIT) Performing pull rebase from origin on branch master...
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
2020-06-03T08:44:10.227Z [MASTER] error: Syncing with storage target git: [ FAILED ]
2020-06-03T08:44:10.229Z [MASTER] error: error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Host Info:

• OS: k8s cluster, Docker
• Wiki.js version: 2.3.81
• Database engine: postgres 12

[Mpic]

Or having a notification to manually do the merge ?