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

Add pre-conflict merge screen #923

Open
skjnldsv opened this issue Sep 1, 2023 · 2 comments
Open

Add pre-conflict merge screen #923

skjnldsv opened this issue Sep 1, 2023 · 2 comments
Labels
1. to develop Accepted and waiting to be taken care of

Comments

@skjnldsv
Copy link
Contributor

skjnldsv commented Sep 1, 2023

image

cc @szaimen @nimishavijay
@skjnldsv skjnldsv added the 1. to develop Accepted and waiting to be taken care of label Sep 1, 2023
@skjnldsv skjnldsv mentioned this issue Sep 1, 2023
Closed
@szaimen
Copy link
Contributor

szaimen commented Sep 1, 2023 •
edited
Loading

Looks like a good proposal to me in general 👍

However I would probably name the first one Keep all files instead of Keep both files

And we should probably add icons to the buttons?

Also cc @jancborchardt @marcoambrosini

@marcoambrosini
Copy link

I think that the let me choose file by file should probably be the default option.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
1. to develop Accepted and waiting to be taken care of
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@skjnldsv @marcoambrosini @szaimen