Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

[FakeFake] fix: this is a fake change.#1255

Closed
andyliuliming wants to merge 1 commit intoandliu/go_bin_datafrom
andliu/go_bin_data_fake_change
Closed

[FakeFake] fix: this is a fake change.#1255
andyliuliming wants to merge 1 commit intoandliu/go_bin_datafrom
andliu/go_bin_data_fake_change

Conversation

@andyliuliming
Copy link
Member

Reason for Change:

Issue Fixed:

Requirements:

Notes:

@acs-bot acs-bot added the size/M label May 8, 2019
@acs-bot
Copy link

acs-bot commented May 8, 2019

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: andyliuliming
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: mboersma

If they are not already assigned, you can assign the PR to them by writing /assign @mboersma in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@andyliuliming
Copy link
Member Author

andyliuliming commented May 8, 2019

@CecileRobertMichon @mboersma
this PR is to mock the PR after merged this PR: #1088

@andyliuliming
Copy link
Member Author

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@andyliuliming
Copy link
Member Author

@CecileRobertMichon "Azure Pipelines could not run because the pipeline triggers exclude this branch/path." :(

@CecileRobertMichon
Copy link
Contributor

@andyliuliming in order to mock the situation we need two PRs modifying the parts/ directory and one of them merging before the other to see if that creates merge conflicts in the second PR.

@CecileRobertMichon
Copy link
Contributor

you're not trying to merge into Azure/master, we only run the pipeline on the Azure/master branch that's why you're getting that error message.

@andyliuliming
Copy link
Member Author

andyliuliming commented May 9, 2019

@andyliuliming in order to mock the situation we need two PRs modifying the parts/ directory and one of them merging before the other to see if that creates merge conflicts in the second PR.

@CecileRobertMichon
yes, that's I'm trying to do here.

andliu/go_bin_data branch is used to as a base branch like the master.

and the PR here is to mock one PR after the PR 1088 is merged.
and actually you can see the change is very clear here, and the git will definitely auto merge for us.

@CecileRobertMichon
Copy link
Contributor

what about make ensure-generated? I'll temporarily allow the pipeline on your fork so we can try it out

@CecileRobertMichon
Copy link
Contributor

/azp run pr-e2e

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@codecov
Copy link

codecov bot commented May 9, 2019

Codecov Report

Merging #1255 into andliu/go_bin_data will not change coverage.
The diff coverage is n/a.

@@                 Coverage Diff                 @@
##           andliu/go_bin_data    #1255   +/-   ##
===================================================
  Coverage               74.81%   74.81%           
===================================================
  Files                     128      128           
  Lines                   18318    18318           
===================================================
  Hits                    13705    13705           
  Misses                   3829     3829           
  Partials                  784      784

@andyliuliming
Copy link
Member Author

andyliuliming commented May 13, 2019

@CecileRobertMichon looks like all pass.

@CecileRobertMichon CecileRobertMichon deleted the andliu/go_bin_data_fake_change branch May 20, 2019 16:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants