Skip to content

Add sync a fork branch with the upstream repository - #1084

Merged
acrobat merged 5 commits into
KnpLabs:masterfrom
DAGpro:sync-upstream
Oct 24, 2022
Merged

Add sync a fork branch with the upstream repository #1084
acrobat merged 5 commits into
KnpLabs:masterfrom
DAGpro:sync-upstream

Conversation

@DAGpro

@DAGproDAGpro commented Sep 18, 2022

Copy link
Copy Markdown
Contributor
QA
New feature?✔️
Fixed issues#1083

iBotPeaches
iBotPeaches reviewed Sep 19, 2022
View reviewed changes

@iBotPeachesiBotPeaches left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@DAGpro - You'll want to fix CI issues here. Looks like a basic lint issue so the test suite can move forward.

Comment threadlib/Github/Api/Repo.php Outdated
Comment threadlib/Github/Api/Repo.php Outdated
@DAGproDAGpro changed the title Add sync a fork branch with the upstream repositoryfeature #1083 Add sync a fork branch with the upstream repository Sep 19, 2022
@DAGproDAGpro changed the title feature #1083 Add sync a fork branch with the upstream repository Add sync a fork branch with the upstream repository Sep 19, 2022
@DAGpro

DAGpro commented Sep 19, 2022

Copy link
Copy Markdown
ContributorAuthor

@DAGpro - You'll want to fix CI issues here. Looks like a basic lint issue so the test suite can move forward.

The commit message must mention the issue?

@iBotPeaches

iBotPeaches commented Sep 19, 2022

Copy link
Copy Markdown
Contributor

@DAGpro - You'll want to fix CI issues here. Looks like a basic lint issue so the test suite can move forward.

The commit message must mention the issue?

The squash merge normally renames the commit anyway, so don't think that important. You still have some linting issues btw - https://github.styleci.io/analyses/xgBanO

@DAGpro
DAGproforce-pushed the sync-upstream branch 2 times, most recently from 53a822f to 369de6bCompareSeptember 19, 2022 17:22
@DAGpro

DAGpro commented Sep 20, 2022

Copy link
Copy Markdown
ContributorAuthor

@iBotPeaches now no problem to merge?

acrobat
acrobat requested changes Oct 23, 2022
View reviewed changes

@acrobatacrobat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks for the PR @DAGpro!

Can you also add a test for this method, see: https://github.com/KnpLabs/php-github-api/blob/master/test/Github/Tests/Api/RepoTest.php. And add a docs entry so it is documented, see https://github.com/KnpLabs/php-github-api/blob/master/doc/repos.md

Comment threadlib/Github/Api/Repo.php Outdated
@acrobatacrobat linked an issue Oct 23, 2022 that may be closed by this pull request
Sync a fork branch with the upstream repository #1083
Closed
acrobat
acrobat requested changes Oct 24, 2022
View reviewed changes

@acrobatacrobat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

One small remark and then it's ready to merge!

Comment threadlib/Github/Api/Repo.php Outdated
@acrobat
acrobat merged commit f1cb6b6 into KnpLabs:masterOct 24, 2022
@acrobat

acrobat commented Oct 24, 2022

Copy link
Copy Markdown
Collaborator

Thanks @DAGpro! And congrats on your first contribution! 🎉

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@acrobatacrobatacrobat approved these changes
+1 more reviewer
@iBotPeachesiBotPeachesiBotPeaches left review comments
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.

Sync a fork branch with the upstream repository

3 participants

@DAGpro@iBotPeaches@acrobat