Skip to content

Commit 7c9e08d

Browse files
authored
Update README.md
1 parent 86bcca9 commit 7c9e08d

File tree

1 file changed

+31
-2
lines changed

1 file changed

+31
-2
lines changed

README.md

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,31 @@
1-
# git-merge
2-
notes and schedule for the git merge conference 2024
1+
# Git Merge Information
2+
3+
Notes and schedule for the 2024 Git Merge conference in Berlin.
4+
5+
## Day One: Talks
6+
7+
| Time | Talk | Speaker |
8+
| ------------- | ------------- | ------------- |
9+
| 9:00a | **Doors Open** |
10+
| 10:00a | *Welcome* | Scott Chacon & Taylor Blau |
11+
| 10:15a | Scaling Git | [Taylor Blau](https://github.com/ttaylorr) |
12+
| 10:40a | How we built a peer-to-peer forge on top of Git | [Alexis Sellier](https://github.com/cloudhead) |
13+
| 11:05a | Jujutsu - A Git-compatible VCS | [Martin von Zweigbergk](https://github.com/martinvonz) |
14+
| 11:30a | **Break (15min)** |
15+
| 11:45a | State of Libification - Overview and Update on Effort | [Emily Shaffer](https://github.com/nasamuffin) |
16+
| 12:10p | The Git Credential Helper Protocol: What's New | [Brian Carlson](https://github.com/bk2204) |
17+
| 12:35p | libgit2: past, present, and future | [Edward Thomson](https://github.com/ethomson) |
18+
| 1:00p | **Lunch (1.5h)** |
19+
| 2:30p | Abusing Git for GitButler | [Scott Chacon](https://github.com/schacon) |
20+
| 2:55p | Introduction to the reftable backend | [Patrick Steinhardt](https://gitlab.com/pks-t) |
21+
| 3:20p | git-filter-repo for rewriting Git history | [Elijah Newren](https://github.com/newren) |
22+
| 3:45p | Leveraging AI to ensure Git Monorepo performance under heavy workloads | [Daniele Sassoli](https://github.com/DanieleSassoli) |
23+
| 4:10p | **Break (15min)** |
24+
| 4:25p | Stories of GitOxide: Reimplementing Git in Rust | [Sebastian Thiel](https://github.com/Byron) |
25+
| 4:50p | Securing Git Repositories with Gittuf | [Aditya Sirish A Yelgundhalli](https://github.com/adityasaky), [Billy Lynch](https://github.com/wlynch) |
26+
| 5:15p | Marrying Meta's source control with Git | [Muir Manders](https://github.com/muirdm), [Rajiv Sharma](https://github.com/RajivTS) |
27+
| 5:45p | *Closing* | Scott Chacon & Taylor Blau |
28+
29+
## Day Two: Unconference
30+
31+
The second day will be unconference style. The talks will be suggested and slotted on a board in the main hall. Notes from each session will be added here.

0 commit comments

Comments
 (0)