-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
Long Run Hercules #135
base: develop
Are you sure you want to change the base?
Long Run Hercules #135
Conversation
It looks like there is a conflict on a file that shouldn't be in the repository (.vscode/launch.json). It looks like this file slipped into the repository in #58 (although the .vscode directory was also added to the .gitignore in that PR). Likely, this can simply be removed from the repository. |
@misi9170 Ah, yeah, I spoke with Zack about that file, we can delete it from the repository! |
Thanks---I've removed it. I have a backup saved locally that I'll keep for the time being in case anyone needs it, just let me know. EDIT: for some reason, this didn't resolve the conflict. I'll look into that some more. |
Long Run Hercules
Opening this draft pull request, with the branch on origin, to facillitate the development of long-running Hercules. @abhineet-gupta , you and I can either commit direct to this branch or else submit PRs to the branch from our forks.
We can further use this PR to track what we want to do and what we consider to be done. We will likely edit this front matter a lot as we go.
Items to do
Tagging people
@abhineet-gupta @genevievestarke @misi9170 @brookeslawski @christiannvaughn