Wiki › Project
Git conflict workshop
Article
ReadAll pages
From Chaipat's knowledge graph
Git conflict workshop is a hands-on exercise, in Thai, on a common first Git problem. Two people push to the same branch at the same time. In the scenario, two friends each add a file. Person 1 pushes first. Person 2's push is then rejected because the branches have diverged, and the workshop walks through pulling, merging or rebasing, and pushing again. It ran in June 2024 through the CSCMU-TEAMS organisation.