I made changes to the wrong branch #202
Merged
Conversation
This file contains 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
appleboy
approved these changes
Jan 7, 2018
RichardLitt
requested changes
Jan 7, 2018
README.md
Outdated
| @@ -427,6 +428,18 @@ When you want to get rid of all of your untracked files | |||
| $ git clean -f | |||
| ``` | |||
|
|
|||
| ### I made changes on the wrong branch | |||
|
|
|||
| You've made uncommitted changes and realise you're on the wrong branch | |||
There was a problem hiding this comment.
Add a period at the end of the line.
README.md
Outdated
|
|
||
| You've made uncommitted changes and realise you're on the wrong branch | ||
|
|
||
| Stash changes and apply them to the branch you want |
There was a problem hiding this comment.
Add a period, and make this part of the previous paragraph.
README.md
Outdated
|
|
||
| Stash changes and apply them to the branch you want | ||
|
|
||
| ``` |
There was a problem hiding this comment.
Should be a sh code block.
README.md
Outdated
| Stash changes and apply them to the branch you want | ||
|
|
||
| ``` | ||
| git stash |
There was a problem hiding this comment.
Please use the (branch) $ git stash style used elsewhere.
|
I've made the changes you've asked for, let me know if there's anything else @RichardLitt |
RichardLitt
reviewed
Jan 7, 2018
README.md
Outdated
|
|
||
| ```sh | ||
| (wrong_branch)$ git stash | ||
| (wrong_branch)$ git checkout <branch you want to be on> |
There was a problem hiding this comment.
Maybe change <branch you want to be on> to correct_branch?
|
Looks better! Move the section down, too - I think you changed the entry in the TOC, but didn't move the section itself. |
|
Looks good to me! Thank you, @NRKirby! |
aroup
pushed a commit
to aroup/git-flight-rules
that referenced
this pull request
Jan 17, 2020
* I made changes to the wrong branch * Missed from last commit * Fixing links * Making changes * Another change * Moving section
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
How to apply uncommitted changes to another branch.