FilesExpand file tree

 main

/

.gitattributes

Copy path

BlameMore file actions

BlameMore file actions

Latest commit

 

History

History

History

17 lines (16 loc) · 976 Bytes

 main

/

.gitattributes

Top

File metadata and controls

• Code
• Blame

17 lines (16 loc) · 976 Bytes

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

# To use this file, you have to enable the 'theirs' merge driver and run this line:

# git config merge.theirs.driver 'echo "Overwriting %P with their version"; mv "%B" "%A"'

*.proto -diff merge=theirs

*.proto linguist-generated=true

external/java/src/main/java/ch/epfl/dedis/lib/proto/*.java -diff merge=theirs

external/java/src/main/java/ch/epfl/dedis/lib/proto/*.java linguist-generated=true

external/js/cothority/src/protobuf/models.json -diff merge=theirs

external/js/cothority/src/protobuf/models.json linguist-generated=true

external/js/cothority/package-lock.json linguist-generated=true

external/js/cothority/package-lock.json -diff merge=theirs

external/js/kyber/package-lock.json linguist-generated=true

external/js/kyber/package-lock.json -diff merge=theirs

external/js/kyber/dist/* -diff -merge

external/js/kyber/dist/* linguist-generated=true

external/js/kyber/doc/* -diff -merge

external/js/kyber/doc/* linguist-generated=true