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

Improve output gl status for conflicts of type (modified - removed) #27

Open
spderosso opened this issue Mar 8, 2014 · 0 comments
Open

Improve output gl status for conflicts of type (modified - removed) #27

spderosso opened this issue Mar 8, 2014 · 0 comments
Labels
enhancement

Comments

@spderosso
Copy link
Member

If file foo was modified in branch a and at the same time removed in branch b, then after doing a gl {rebase, merge} b gl status will note the conflict but just say:

 foo (with conflicts)

It should say something more informative like

 foo (with conflicts -- modified in a, removed in b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@spderosso