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

Pull'ing with merge conflicts UX #301

Closed
jaipreet-s opened this issue Feb 7, 2019 · 1 comment
Closed

Pull'ing with merge conflicts UX #301

jaipreet-s opened this issue Feb 7, 2019 · 1 comment
Labels
enhancement status:Needs Discussion

Comments

@jaipreet-s
Copy link
Member

Creating this issue to hash out some ideas while dealing with merge conflicts

  1. Use clicks the Pull
  2. IF there are merge conflicts,
    1. Manual merge: The files in question are opened up in the panel with traditional "merge markers"
    2. Visual merge: The NBDime merge resolver UI is opened up in a panel

CC @dimberman as we discussed this in person
@ianhi ianhi mentioned this issue Aug 11, 2020
Open
@fcollonval
Copy link
Member

Closing as covered by #1260

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement status:Needs Discussion
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@fcollonval @jaipreet-s