bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #133851 - oli-obk:push-pzwykzozkomq, r=jieyouxu

Browse source 
Stop git from merging generated files

See the relevant documentation for details: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1-1-1

This will cause `.stderr`, `.stdout`, `.mir`, and `.fixed` files to stop generating conflict markers and instead just pick the version from your branch, not the one you're rebasing over. Git will still raise a conflict and thus stop a rebase at that commit, but it avoids having to deal with conflict markers in files where we just bless them away anyway.
This commit is contained in:
Matthias Krüger 2024-12-04 18:23:44 +01:00 • committed by GitHub
commit d80d2c64b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitattributes vendored
View file

@ -4,8 +4,10 @@
*.cpp rust *.cpp rust
*.h rust *.h rust
*.rs rust diff=rust *.rs rust diff=rust
*.fixed linguist-language=Rust *.fixed linguist-language=Rust -merge
*.mir linguist-language=Rust *.mir linguist-language=Rust -merge
*.stderr -merge
*.stdout -merge
src/etc/installer/gfx/* binary src/etc/installer/gfx/* binary
src/vendor/** -text src/vendor/** -text
Cargo.lock linguist-generated=false Cargo.lock linguist-generated=false