Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add support to sync a fork branch with the upstream repository. #2337

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.

Sign up for GitHub

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

Jump to bottom
Merged
gmlewis merged 4 commits into from
May 16, 2022
Merged

Add support to sync a fork branch with the upstream repository. #2337

gmlewis merged 4 commits into from
May 16, 2022

Conversation

@lkxed
Copy link
Contributor

@lkxed lkxed commented Apr 20, 2022

Resolved #2335

Thanks for this opportunity.

@codecov
Copy link

codecov bot commented Apr 20, 2022 •
edited
Loading

Codecov Report

Merging #2337 (b763b66) into master (00e4233) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #2337   +/-   ##
=======================================
  Coverage   98.04%   98.05%           
=======================================
  Files         118      118           
  Lines       10458    10470   +12     
=======================================
+ Hits        10254    10266   +12     
  Misses        140      140           
  Partials       64       64
Impacted Files Coverage Δ
github/repos_merging.go 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 00e4233...b763b66. Read the comment docs.

gmlewis
gmlewis requested changes Apr 20, 2022
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @lkxed !
This is looking great, but instead of creating two new files, would you mind adding your code to the existing repos_merging.go and repos_merging_test.go files?
I think both are small enough and related enough to live in the same file.

@lkxed
Copy link
Contributor Author

lkxed commented Apr 20, 2022

Hi, @gmlewis . I have moved my code. :)

gmlewis
gmlewis requested changes Apr 20, 2022
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @lkxed !
Just one minor renaming tweak, please, then I think we will be ready for a second LGTM before merging.

@gmlewis gmlewis added the NeedsReview PR is awaiting a review before merging. label Apr 20, 2022
@lkxed
Copy link
Contributor Author

lkxed commented Apr 20, 2022

@gmlewis I have changed the names. :)

gmlewis
gmlewis approved these changes Apr 20, 2022
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @lkxed !
LGTM.

Awaiting second LGTM+Approval from any other contributor to this repo before merging.

raynigon
raynigon approved these changes May 16, 2022
View reviewed changes
Copy link
Contributor

@raynigon raynigon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gmlewis
Copy link
Collaborator

gmlewis commented May 16, 2022

LGTM

Thank you, @raynigon !
Merging.

@gmlewis gmlewis merged commit 11817b6 into google:master May 16, 2022
@gmlewis gmlewis removed the NeedsReview PR is awaiting a review before merging. label May 16, 2022
@lkxed lkxed deleted the i2335-support-sync-fork-upstream branch May 18, 2022 18:55
@gmlewis gmlewis mentioned this pull request May 25, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gmlewis gmlewis gmlewis approved these changes

+1 more reviewer

@raynigon raynigon raynigon approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Support "Sync a fork branch with the upstream repository"

3 participants

@lkxed @gmlewis @raynigon