{"id":18663350,"url":"https://github.com/git/git-merge","last_synced_at":"2025-04-11T21:32:14.471Z","repository":{"id":257420576,"uuid":"858209628","full_name":"git/git-merge","owner":"git","description":"Notes and schedule for Git Merge 2024.","archived":false,"fork":false,"pushed_at":"2024-09-26T07:26:00.000Z","size":872,"stargazers_count":10,"open_issues_count":1,"forks_count":10,"subscribers_count":4,"default_branch":"main","last_synced_at":"2024-11-07T08:16:06.655Z","etag":null,"topics":[],"latest_commit_sha":null,"homepage":"https://git-merge.com/","language":null,"has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/git.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2024-09-16T13:57:56.000Z","updated_at":"2024-10-20T03:35:51.000Z","dependencies_parsed_at":"2024-09-16T17:04:49.364Z","dependency_job_id":"300d99f6-36c4-490d-9103-42cce323ce35","html_url":"https://github.com/git/git-merge","commit_stats":null,"previous_names":["gitbutlerapp/git-merge","git/git-merge"],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/git%2Fgit-merge","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/git%2Fgit-merge/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/git%2Fgit-merge/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/git%2Fgit-merge/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/git","download_url":"https://codeload.github.com/git/git-merge/tar.gz/refs/heads/main","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":223479543,"owners_count":17151931,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":[],"created_at":"2024-11-07T08:16:09.708Z","updated_at":"2024-11-07T08:16:10.589Z","avatar_url":"https://github.com/git.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# Git Merge Information\n\nNotes and schedule for the 2024 Git Merge conference in Berlin.\n\n## Day One: Talks\n\n| Time  | Talk | Speaker |\n| ------------- | ------------- | ------------- |\n| 9:00a  | **Doors Open** |\n| 10:00a  | *Welcome*  | Scott Chacon \u0026 Taylor Blau |\n| 10:15a  | Scaling Git  | [Taylor Blau](https://github.com/ttaylorr) |\n| 10:40a | How we built a peer-to-peer forge on top of Git | [Alexis Sellier](https://github.com/cloudhead) |\n| 11:05a | Jujutsu - A Git-compatible VCS | [Martin von Zweigbergk](https://github.com/martinvonz) |\n| 11:30a  | **Break (15min)** |\n| 11:45a | [State of Libification - Overview and Update on Effort](https://tinyurl.com/gm2024-libification) | [Emily Shaffer](https://github.com/nasamuffin) |\n| 12:10p | The Git Credential Helper Protocol: What's New\t| [Brian Carlson](https://github.com/bk2204) |\n| 12:35p | libgit2: past, present, and future\t| [Edward Thomson](https://github.com/ethomson) |\n| 1:00p | **Lunch (1.5h)** |\n| 2:30p | Abusing Git for GitButler\t| [Scott Chacon](https://github.com/schacon) |\n| 2:55p | Introduction to the reftable backend | [Patrick Steinhardt](https://gitlab.com/pks-t) |\n| 3:20p | git-filter-repo for rewriting Git history | [Elijah Newren](https://github.com/newren) |\n| 3:45p | Leveraging AI to ensure Git Monorepo performance under heavy workloads | [Daniele Sassoli](https://github.com/DanieleSassoli) |\n| 4:10p | **Break (15min)** |\n| 4:25p | Stories of GitOxide: Reimplementing Git in Rust | [Sebastian Thiel](https://github.com/Byron) |\n| 4:50p | Securing Git Repositories with Gittuf | [Aditya Sirish A Yelgundhalli](https://github.com/adityasaky) |\n| 5:15p | Marrying Meta's source control with Git | [Muir Manders](https://github.com/muirdm), [Rajiv Sharma](https://github.com/RajivTS) |\n| 5:45p | *Closing* | Scott Chacon \u0026 Taylor Blau |\n| 7:00p | *After Party* | [Mein Haus Am See: Cosmic Kaspar](https://www.cosmic-kaspar.de/) |\n\n## Day One: After Party Details\n\n[Cosmic Kaspar](https://www.cosmic-kaspar.de/) (basement of Mein Haus Am See, Rosenthaler Platz)\u003cbr/\u003e\nBrunnenstr. 197/198, 10119 Berlin \u003cbr/\u003e\n7pm\n\n## Day Two: Unconference\n\nThe 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.\n\nThe schedule for the breakout rooms is as follows:\n\n![PXL_20240920_083357527](https://github.com/user-attachments/assets/6545e038-8709-4e56-b70b-053d3ae31f5b)\n\nIf you're leading a breakout room, and you need to move your breakout room, please let one of the organisers know.\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fgit%2Fgit-merge","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fgit%2Fgit-merge","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fgit%2Fgit-merge/lists"}