Skip to content

Remote#branch and #merge should default to current branch instead of master #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2023

Conversation

jcouball
Copy link
Member

@jcouball jcouball commented Mar 3, 2023

Your checklist for this pull request

🚨Please review the guidelines for contributing to this repository.

  • Ensure all commits include DCO sign-off.
  • Ensure that your contributions pass unit testing.
  • Ensure that your contributions contain documentation if applicable.

Description

This PR makes two changes:

  1. Remote#branch when not given a branch name will create a Branch object representing the remote tracking branch with the same name as the current branch. Originally, the default was master even if a branch of that name did not exist.
  2. Remote#merge when not given a branch name will merge from the remote tracking branch with the same name as the current branch. Before this PR, merge would try to merge from the remote master branch even if that branch did not exist.

…"master"

Signed-off-by: James Couball <jcouball@yahoo.com>
@jcouball jcouball force-pushed the remote_branch_merge_default branch from d9f4c4d to 3bd783b Compare March 3, 2023 19:48
@jcouball jcouball merged commit 7d8848c into master Mar 3, 2023
@jcouball jcouball deleted the remote_branch_merge_default branch March 3, 2023 19:55
This was referenced Mar 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant