development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-30 06:03:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update docs/process/testing.md

Browse source 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
This commit is contained in:
Steven Yeh 2019-05-02 12:17:37 -04:00 committed by GitHub
parent 12d49f5729
commit f6e0c30b61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/process/testing.md
View file

@ -232,7 +232,7 @@
- [ ] Merge hint shows status and branches to be merged
- [ ] `Merge` button only activated if something to merge (includes awaiting conflicts)
- [ ] If merged, success banner is shown temporarily; user can `X` to remove
- [ ] If conflicts, conflict modal shows quanity of files, ability to open in [editor], open in command line, `Abort` button, while `Commit merge` button is deactivated until files are resolved; Changes tab shows all files
- [ ] If conflicts, conflict modal shows quantity of files, ability to open in [editor], open in command line, `Abort` button, while `Commit merge` button is deactivated until files are resolved; Changes tab shows all files
- [ ] If conflict resolved, files marked green, and user can click `Commit merge` button
- [ ] If merged, success banner is shown temporarily; user can `X` to remove
- [ ] Binary files must be resolved in command line before committing merge