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

Should sequenced conflict be a child of the non-sequenced one? #3

Open
xandkar opened this issue Nov 8, 2014 · 0 comments
Open

Should sequenced conflict be a child of the non-sequenced one? #3

xandkar opened this issue Nov 8, 2014 · 0 comments
Labels
question

Comments

@xandkar
Copy link
Owner

xandkar commented Nov 8, 2014

Right now:

/foo/bar
          /foo/bar  (qux's conflicted copy 2014-11-08)
          /foo/bar  (qux's conflicted copy 2014-11-08 (1))

Maybe should be:

/foo/bar
          /foo/bar  (qux's conflicted copy 2014-11-08)
                  /foo/bar  (qux's conflicted copy 2014-11-08 (1))
@xandkar xandkar changed the title Sequenced conflict should be a child of the non-sequenced one Should sequenced conflict be a child of the non-sequenced one? Nov 9, 2014
xandkar referenced this issue Nov 9, 2014
@xandkar
Make sequenced conflict a child of non-sequenced one.
187a4b8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
question
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@xandkar