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

gitattributes: remove the union merge driver since GitHub doesn't support it #70576

Closed
wants to merge 1 commit into from
Closed

gitattributes: remove the union merge driver since GitHub doesn't support it #70576

wants to merge 1 commit into from

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Nov 2, 2018

GitHub doesn't support the union merge driver currently: isaacs/github#487.

Prow doesn't use git merge but does a "GitHub merge" through the GH API while automatically merging PRs. GitHub will not allow merging PRs if they have conflicts so a union merge doesn't make much sense here.

/kind cleanup

Does this PR introduce a user-facing change?:

NONE

@nikhita
gitattributes: remove merge drivers since GitHub doesn't support them
313b966 
Prow does a "GitHub merge" through the API while automatically merging
PRs.
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 2, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@nikhita
Copy link
Member Author

nikhita commented Nov 2, 2018

/cc @sttts @mfojtik @cblecker

I have no idea which SIG this should be. I guess contribex because it vaguely relates to contributors' experience...with our git config? ¯\_(ツ)_/¯

/sig contributor-experience
/priority important-longterm
/shrug

@k8s-ci-robot k8s-ci-robot added ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 2, 2018
@cblecker
Copy link
Member

cblecker commented Nov 2, 2018

hack/verify-flags/known-flags.txt == sig-cli
and test/test_owners.csv == sig-testing

@cblecker
Copy link
Member

cblecker commented Nov 2, 2018

Won't this still help locally resolve conflicts?

@fejta-bot
Copy link

Issues go stale after 90d of inactivity.
Mark the issue as fresh with /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.

If this issue is safe to close now please do so with /close.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 31, 2019
@nikhita
Copy link
Member Author

nikhita commented Feb 15, 2019

Won't this still help locally resolve conflicts?

Yeah, I think so. Closing.

/close

@k8s-ci-robot
Copy link
Contributor

@nikhita: Closed this PR.

In response to this:

Won't this still help locally resolve conflicts?

Yeah, I think so. Closing.

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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

@brendandburns brendandburns Awaiting requested review from brendandburns

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

@cblecker cblecker Awaiting requested review from cblecker

@mfojtik mfojtik Awaiting requested review from mfojtik

@sttts sttts Awaiting requested review from sttts

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nikhita @k8s-ci-robot @cblecker @fejta-bot