Fix issue #533: Not all local branches can merge with its remote-tracking branch by a single git pull command at once #536
Conversation
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
|
|
||
| This command shows which branch is automatically pushed to when you run `git push` while on certain branches. | ||
| It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple branches that are automatically merged when you run `git pull`. | ||
| It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple local branches that are able to merge automatically with its remote-tracking branch when you run `git pull`. |
There was a problem hiding this comment.
Let's do:
able to merge automatically with _their_ remote-tracking branch
I think that's a bit smoother.
There was a problem hiding this comment.
Thanks for correcting. ^_^
…e-tracking branch by a single git pull command at once The merge feature of git pull only works on current branch.
|
Updated with amend. |
|
Nice. |
ben
added a commit
that referenced
this pull request
Feb 24, 2016
Fix issue #533: Not all local branches can merge with its remote-tracking branch by a single git pull command at once
|
Thanks. 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.