Update local main branch during git update
#64
Merged
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 ensures that the local main branch is updated during `git update`. Without this it's necessary for the end user to run `git update` separately on the main branch, and it can be confusing if they e.g. want to diff their newly-updated feature branch against the main branch and don't realize it's stale.
Merged
+1. This is a common paper cut for me as well. I love this change. One question...
Thoughts? |
Per @wireframe's recommendation, update the main branch from remote before updating the feature branch, and update the feature branch from local main.
|
@wireframe love it! Done in be91d7b. |
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.
This ensures that the local main branch is updated during
git update. Without this it's necessary for the end user to rungit updateseparately on the main branch, and it can be confusing if they e.g. want to diff their newly-updated feature branch against the main branch and don't realize it's stale. This happens to me fairly often and I couldn't think of a reason someone wouldn't want their main branch updated so this seemed like a sane change.