Skip to content
This repository has been archived by the owner on Apr 25, 2023. It is now read-only.

[FEAT] Git Merge #95

Open
5 tasks
crutchcorn opened this issue Jun 23, 2021 · 0 comments
Open
5 tasks

[FEAT] Git Merge #95

crutchcorn opened this issue Jun 23, 2021 · 0 comments
Assignees

Comments

@crutchcorn
Copy link
Member

crutchcorn commented Jun 23, 2021

Add ability to merge branches

  • Merge dialog #96
  • Merge conflicts
    • Ability to abort merge
    • Warning subheader
    • Merge conflict status screen

Some initial mockups that @PrattiDev provided (unfinished, but making public for bookkeeping)

image

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant