Skip to content

Commit cdc0161

Browse files
committed
ignore autogenerated files
They will create unnecessary merge conflicts every time people pull stuff from here. repo-utils#1 (comment)
1 parent 50cb810 commit cdc0161

File tree

4 files changed

+12
-43
lines changed

4 files changed

+12
-43
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@
55

66
node_modules
77
coverage
8+
9+
# autogenerated files ignored in repo-utils/badgeboard
10+
# to avoid downstream merge conflicts
11+
#
12+
# remove this when you're creating a real badgeboard
13+
/index.html
14+
/src/db.json

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
```sh
44
~/your-org.github.io$ git pull https://github.com/repo-utils/badgeboard.git
5+
~/your-org.github.io$ make ; make db
6+
~/your-org.github.io$ git commit index.html src/db.json -m 'rebuild'
57
~/your-org.github.io$ git push
68
```
79

@@ -15,12 +17,15 @@ Change:
1517

1618
- src/maintainers.json
1719
- src/projects.json
20+
- .gitignore (unignore autogenerated files)
1821

1922
Make it:
2023

2124
```
2225
~/your-org.github.io$ make db
2326
~/your-org.github.io$ make
27+
~/your-org.github.io$ git add src/db.json index.html
28+
~/your-org.github.io$ git commit src/db.json index.html -m 'rebuild'
2429
```
2530

2631
Test it:

index.html

-1
This file was deleted.

src/db.json

-42
This file was deleted.

0 commit comments

Comments
 (0)