[FEAT] Git Merge - Githubissues

oceanbit / GitShark

🦈 A Git client to surf through your repos on mobile

https://gitshark.dev

Mozilla Public License 2.0

137 stars 9 forks source link

Open crutchcorn opened 3 years ago

crutchcorn commented 3 years ago

Add ability to merge branches

[ ] #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)