github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36075 from rmmh/root-gitattributes

Browse Source 
Automatic merge from submit-queue

Move .gitattributes annotation to the root, so GitHub will respect them.

This should fix the merge conflicts by letting GitHub use the simpler line-by-line algorithm for this file. Having .gitattributes in a sub-directory would work for local merging, but would show conflicts on the web UI.
This commit is contained in:
Kubernetes Submit Queue 2016-11-02 12:13:54 -07:00 committed by GitHub
commit 539165d899
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
hack/verify-flags/known-flags.txt merge=union
test/test_owners.csv merge=union

1
hack/verify-flags/.gitattributes vendored
View File

@ -1 +0,0 @@
known-flags.txt merge=union

1
test/.gitattributes vendored
View File

@ -1 +0,0 @@
test_owners.csv merge=union