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

sync-zh-files-from-1.12 #14014

Closed

Conversation

@fleeto
Copy link
Contributor

commented Apr 24, 2019

No description provided.

@k8s-ci-robot

This comment has been minimized.

Copy link

commented Apr 24, 2019

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

If they are not already assigned, you can assign the PR to them by writing /assign @chenopis 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

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

@fleeto

This comment has been minimized.

Copy link
Contributor Author

commented Apr 24, 2019

/assign @xichengliudui

@SataQiu

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

/lgtm

@SataQiu

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

@chenrui333

This comment has been minimized.

Copy link
Member

commented Apr 26, 2019

as discussed, it would be best that we dont lose any commit history of the migrations between the versions.

Little bit details about the technical approach:

  • PR from release-1.12 to release1.14
  • Resolve conflicts
  • Filter out the non-zh contents
@tengqm

This comment has been minimized.

Copy link
Contributor

commented Apr 26, 2019

@chenrui333 Are you talking about cherry-picking all those PRs to "release-1.14" branch? That will be a daunting task.

@fleeto Shall we target "master" or "release-1.14"?

@chenrui333

This comment has been minimized.

Copy link
Member

commented Apr 26, 2019

@tengqm not cherry-picking. Two additional commits to merge the branch release-1.12 to branch release-1.14.

In this way, our commit history would be potentially captured when we ultimately moved to master branch.

@chenrui333

This comment has been minimized.

Copy link
Member

commented Apr 26, 2019

I am mostly thinking of this PR merge practice in terms of contribution credit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.