This repository was archived by the owner on Aug 28, 2019. It is now read-only.
Add tips/commands on merging with pending changes#3420
Merged
Asjas merged 1 commit intofreeCodeCamp:masterfrom Jan 8, 2018
Merged
Add tips/commands on merging with pending changes#3420Asjas merged 1 commit intofreeCodeCamp:masterfrom
Asjas merged 1 commit intofreeCodeCamp:masterfrom
Conversation
Add tips/commands on handling pending git changes when attempting to merge one branch into another.
Contributor
|
Thank you for your contribution to the page! 👍 |
Bouncey
pushed a commit
to Bouncey/guides
that referenced
this pull request
Jan 25, 2018
Add tips/commands on handling pending git changes when attempting to merge one branch into another.
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.
2 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.
Add tips/commands on handling pending git changes when attempting to merge one branch into another.