Jm tips #16
Merged
Jm tips #16
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
|
👍 |
| @@ -274,3 +274,44 @@ And finally, let's cherry-pick the commit for bug #14: | |||
| ``` | |||
| (14)$ git cherry-pick 5ea5173 | |||
| ``` | |||
| ## I want to discard local commits so my branch is the same as one on the server | |||
|
|
|||
There was a problem hiding this comment.
the much easy way, just git reset --hard origin/bug24 and you've got the same as one the server
k88hudson
added
PR needs review
PR changes requested
and removed
PR needs review
labels
Merged
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.
git flight rules is a great idea! Here's a few more git scenarios and solutions.