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

Collision detection #58

Open
csmith opened this issue Mar 31, 2021 · 1 comment
Open

Collision detection #58

csmith opened this issue Mar 31, 2021 · 1 comment

Comments

@csmith
Copy link
Member

csmith commented Mar 31, 2021

The edit form should write out a hash of the contents in a hidden field, and if that doesn't match the latest contents on submit the user should be asked if they want to force the change or not.
@ShaneMcC
Copy link
Member

ShaneMcC commented Apr 3, 2021 •
edited
Loading

This could be done nicely with git in most cases?

Do the edit in a branch, merge/rebase it in, delete the branch?

If it fails to merge, throw an error and show the clashes or so?

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
No milestone
Development

No branches or pull requests
2 participants
@csmith @ShaneMcC