Skip to content

Do not merge: Modify server#3

Open
jessicaguo wants to merge 4 commits into
masterfrom
modify-server
Open

Do not merge: Modify server#3
jessicaguo wants to merge 4 commits into
masterfrom
modify-server

Conversation

@jessicaguo

Copy link
Copy Markdown
Member

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

@dlebauer

dlebauer commented Sep 9, 2022

Copy link
Copy Markdown
Contributor

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