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

Upload menu def files to separate branch #429

Open
tim-moody opened this issue Oct 5, 2021 · 1 comment
Open

Upload menu def files to separate branch #429

tim-moody opened this issue Oct 5, 2021 · 1 comment

Comments

@tim-moody
Copy link
Contributor

Instead of committing locally changed menu def files to iiab-share/js-menu-files/master commit them to a branch.

  • Branch name is menu def name + uploader's IP address (leaving off datetime for now)
  • Upload still done as part of sync function, perhaps immediately in future.
  • Need to store branch name along with object SHA
@tim-moody
Copy link
Contributor Author

Current Cases

Case Edit Status Local SHA Action
Unchanged repo == repo Nothing to Do
Repo is Newer repo != repo Pull if flag set
Local is Newer local_change == repo Push if flag set
Changed local_change != repo Requires manual merge

Add Cases

  • Same as in user's branch
  • In user's branch, but changed locally

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
1 participant
@tim-moody