Skip to content
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

fix: try to merge the upstream repo branch on the fork #330

Merged
merged 2 commits into from Feb 23, 2022

Conversation

chingor13
Copy link
Contributor

@chingor13 chingor13 commented Feb 22, 2022

When forking, the forked repo is often way out of sync with its upstream repo. When using fork, we should attempt to sync the branch.

Fixes #335

@chingor13 chingor13 added the automerge Merge the pull request once unit tests and other checks pass. label Feb 23, 2022
@gcf-merge-on-green gcf-merge-on-green bot merged commit 2d5c3f9 into main Feb 23, 2022
@gcf-merge-on-green gcf-merge-on-green bot deleted the merge-upstream branch February 23, 2022 22:51
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge the pull request once unit tests and other checks pass. label Feb 23, 2022
gcf-merge-on-green bot pushed a commit that referenced this pull request Feb 23, 2022
🤖 I have created a release *beep* *boop*
---


### [2.1.4](v2.1.3...v2.1.4) (2022-02-23)


### Bug Fixes

* **cli:** don't crash when there are no changes ([#334](#334)) ([e606126](e606126)), closes [#229](#229)
* try to merge the upstream repo branch on the fork ([#330](#330)) ([2d5c3f9](2d5c3f9)), closes [#335](#335)

---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
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.

RequestError [HttpError]: Error while creating a tree and updating the ref: Not Found
3 participants