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.

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

Do not merge: Modify server #3

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Do not merge: Modify server #3

wants to merge 4 commits into from

Conversation

jessicaguo
Copy link
Member

Changes made for running code on the EFI server, do not merge into master

@dlebauer
Copy link
Contributor

dlebauer commented Sep 9, 2022

Note that this branch now conflicts with the master branch, perhaps due to a lot of renamed or deleted files? It might be a good time to resolve conflicts.

as seen above
image

git pull origin master
git checkout modify-server
git merge master
git status
# Fix the conflicts and commit the result.
git push -u origin modify-server

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants