git-meta merge should output file-level conflict information
Open
feature-request
merge
- Dominant language
- JavaScript
- Stars
- 233
- Forks
- 54
- PR merge metrics
- No merged PRs in 30d
Description
Command:
```
git meta merge otherbranch
```
Output:
```
Submodule ts/foo/bar is conflicted.
```
Expected:
```
Merge conflict in ts/foo/bar/file1.
Merge conflict in ts/foo/bar/file2.
```
Contributor guide
No contributing guide indexed for this repository
Assessment
This issue has not been assessed yet.