Wiki › Project

Git conflict workshop

Project · workshop · 2024

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.

See also

In the knowledge graph

Git conflict workshop and the 8 things it is linked to. Open any dot for its page, or explore it in the full graph.

Teaching Python and Assembly · work · links hereTeachingTrunk-based development workshop · work · mentionsTrunk-based devel…GitHub bootcamp 2023 · work · links hereGitHub bootcamp 2…Git · skill · Built withGitResolving Git conflicts · technique · ImplementsResolving Git con…Teaching and community · theme · ThemesTeaching and comm…CSCMU-TEAMS on GitHub · person, role or place · ContextCSCMU-TEAMSGit and GitHub workshops · game or collection · Part ofGit and GitHub wo… Git conflictworkshop
8 linked in the graph: 3 works1 skill1 technique1 theme1 person, role or place1 game or collection
When
2023202420252026
Jun 2024 · 1 commits

As data

Everything on this page is read from triples in the knowledge graph. These are the 20 it states about Git conflict workshop, and 2 more its ontology implies; the console runs SPARQL over the whole graph, here in your browser.

Download
@prefix id: <https://ask.chaipat.cc/id/> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix cj: <https://ask.chaipat.cc/ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

id:GitConflictWorkshop
    a cj:Project ;
    rdfs:label "Git conflict workshop" ;
    cj:description "Workshop on resolving Git conflicts from divergent pushes." ;
    cj:context id:CSCMUTeams ;
    cj:repository "https://github.com/CSCMU-TEAMS/workshop-single-branch-divergent-push"^^xsd:anyURI ;
    cj:firstCommit "2024-06-13"^^xsd:date ;
    cj:lastCommit "2024-06-13"^^xsd:date ;
    cj:commitCount 1 ;
    cj:date "2024-06-13"^^xsd:date ;
    cj:kind "workshop" ;
    cj:license "MIT" ;
    cj:theme id:ThemeTeaching ;
    cj:uses id:Git ;
    cj:tier 2 ;
    cj:implements id:GitConflicts ;
    cj:partOf id:CMUGitWorkshops ;
    cj:mentions id:TBDWorkshop ;
    cj:article "https://ask.chaipat.cc/wiki/GitConflictWorkshop"^^xsd:anyURI ;
    cj:activeIn id:Y2024 ;
    cj:activity _:b65 .
Works 3
GitHub bootcamp 2023TeachingTrunk-based development workshop