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.

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

build(ci): force fetche PR in merge script #21295

Closed
wants to merge 1 commit into from
Closed

build(ci): force fetche PR in merge script #21295

wants to merge 1 commit into from

Conversation

mhevery
Copy link
Contributor

@mhevery mhevery commented Jan 3, 2018

No description provided.

@mhevery mhevery requested a review from IgorMinar January 3, 2018 22:15
@mhevery mhevery added target: patch This PR is targeted for the next patch release area: core Issues related to the framework runtime labels Jan 3, 2018
IgorMinar
IgorMinar approved these changes Jan 4, 2018
View reviewed changes
Copy link
Contributor

@IgorMinar IgorMinar left a comment

Choose a reason for hiding this comment

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

Can you rewrite the commit message please?

  • explain why we need -f
  • remove (ci)leave it as just build: - ci scope is just for stuff that runs on travis or circle ci
  • fix typo in the description "fetche" -> fetch

@IgorMinar IgorMinar added the action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews label Jan 4, 2018
@IgorMinar IgorMinar removed their assignment Jan 4, 2018
@mhevery
build: force fetch PR in merge script
62192d8 
Use `-f` when doing `git fetch` for the PR. Without 
it the `git fetch` will not overwrite what is currently 
fetched locally, in essence doing fast-forward only.
@mhevery mhevery added action: merge The PR is ready for merge by the caretaker and removed action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews labels Jan 5, 2018
@mhevery
Copy link
Contributor Author

mhevery commented Jan 5, 2018

took care all of your concerns.

@IgorMinar
Copy link
Contributor

IgorMinar commented Jan 5, 2018 via email

kara pushed a commit that referenced this pull request Jan 5, 2018
@mhevery @kara
build: force fetch PR in merge script (#21295)
5dd2df6 
Use `-f` when doing `git fetch` for the PR. Without 
it the `git fetch` will not overwrite what is currently 
fetched locally, in essence doing fast-forward only.
PR Close #21295
@kara kara closed this in e726d81 Jan 5, 2018
@mhevery mhevery deleted the merge_pr branch February 14, 2018 23:01
leo6104 pushed a commit to leo6104/angular that referenced this pull request Mar 25, 2018
@mhevery @leo6104
build: force fetch PR in merge script (angular#21295)
a7abae7 
Use `-f` when doing `git fetch` for the PR. Without 
it the `git fetch` will not overwrite what is currently 
fetched locally, in essence doing fast-forward only.
PR Close angular#21295
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@IgorMinar IgorMinar IgorMinar approved these changes

Assignees

@mhevery mhevery

Labels
action: merge The PR is ready for merge by the caretaker area: core Issues related to the framework runtime cla: yes target: patch This PR is targeted for the next patch release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mhevery @IgorMinar @googlebot