This repository was archived by the owner on Dec 28, 2021. It is now read-only.
Merged
Conversation
Contributor
Author
|
Here is a gif of zen mode |
Closed
Member
|
Good job! |
Member
|
Now I am having trouble pulling the merge. The local code was modified and not commited recently. And the git output is What should I do? |
Contributor
# Create a new branch for your local changes
git checkout -b my-new-branch
# Commit the changes
git commit -am "My cool changes"
# Return to the master branch and pull
git checkout master
git pull
# If your changes are still relevant, merge them into master
git merge my-new-branchYou can also try and use |
Member
|
Thanks, I'll try it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added a Zen Mode toggle, as requested Issue 34
I made the following changes
moe-zen.jswhich handles the toggle code