Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git-meta merge should output file-level conflict information #697

Open
jhedwardyang opened this issue Mar 4, 2019 · 0 comments
Open

git-meta merge should output file-level conflict information #697

jhedwardyang opened this issue Mar 4, 2019 · 0 comments
Labels
feature-request merge

Comments

@jhedwardyang
Copy link
Contributor

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
feature-request merge
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@jhedwardyang @petroseskinder