Feature Edits Implementation#4

tomadowley wants to merge 2 commits intomaintomadowley/conflicts_test_github:mainfrom

cosine/feature/commit-all-edits-83g0gmtomadowley/conflicts_test_github:cosine/feature/commit-all-edits-83g0gmCopy head branch name to clipboard