engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: added nicer formatting for merge conflicting files

Browse source
This commit is contained in:
Marcin Kuzminski 2019-11-19 16:38:56 +01:00
parent a3815a43af
commit ef0be3b6e8
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/lib/vcs/backends/git/repository.py
View file

@ -990,7 +990,7 @@ class GitRepository(BaseRepository):
except RepositoryError as e:
log.exception('Failure when doing local merge on git shadow repo')
if isinstance(e, UnresolvedFilesInRepo):
metadata['unresolved_files'] = 'file: ' + (', file: '.join(e.args[0]))
metadata['unresolved_files'] = '\n* conflict: ' + ('\n * conflict: '.join(e.args[0]))
merge_possible = False
merge_failure_reason = MergeFailureReason.MERGE_FAILED