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

support simple conflict-free 3way merge #557

Closed
extrawurst opened this issue Mar 1, 2021 · 1 comment · Fixed by #565
Closed

support simple conflict-free 3way merge #557

extrawurst opened this issue Mar 1, 2021 · 1 comment · Fixed by #565
Milestone
v0.12

Comments

@extrawurst
Copy link
Collaborator

based on #319:

the next level in complexity is supporting a simple 3-way merge commit without conflict resolution. this way the complexity of conflict resolution can be put into a separat issue
@extrawurst extrawurst mentioned this issue Mar 1, 2021
Merged
@extrawurst
Copy link
Collaborator Author

extrawurst commented Mar 2, 2021 •
edited
Loading

right now, if a fetch+ff does not work we right now auto merge using 3way commit unless it would produce conflicts

todo:

  • ask user for confirmation

@extrawurst extrawurst mentioned this issue Mar 3, 2021
Closed
@extrawurst extrawurst added this to the v0.12 milestone Mar 3, 2021
@extrawurst extrawurst mentioned this issue Mar 3, 2021
Merged
@extrawurst extrawurst mentioned this issue Mar 4, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.12
Development

Successfully merging a pull request may close this issue.

user confirm merge gitui-org/gitui
1 participant
@extrawurst