Now we're gonna have some INTERMEDIATE FUN!
* I'll share some of my favorite things to do (cherry-pick, blame, change the author so it looks like my coworker did something I just did)...
* Wait, what's a tag? Wait, what's a release? (HINT: THEY'RE THE SAME. SORT OF. OMG I SAID SORT OF, CHILL OUT.)
* Forks and pull requests: COOL STUFF you can do on GitHub/BitBucket (and of course, GitLab!)
* Feature branches -- yes, they're what they sound like.
* Cherry picks and Merges and Rebasing -- what's what?? and, differences, benefits/drawbacks, etc.
* A bit of conflict resolution, detached tags, merged branch cleanup, multiple remotes...
* We'll go over some "omg what did I do" scenarios (and a few online resources).
THEN, if y'all bring your own pain points, we can talk about them and I'll do my best to help!
* If not, I'll briefly cover a fairly universal pain point: git + Drupal code contribution.
.......................
Post-session
.......................
Links! (see below)
* My GitHub repo with my .gitconfig file (all my aliases) and an excerpt from my bashrc file, with the colors/branch indicators you saw in my terminal.
* Session recording from Drupal GovCon 2019
>>>> The --ours --theirs conflict resolution trick starts around 22:20 in the recording!
* Slides! -- such as...
>>>> "Cherry picking vs. merging vs. rebasing" -- with a link to a longer explanation: slides 33-35
>>>> Detached HEAD state: slide 47
* Choose your own adventure for fixing stuff in git
* "GitLab + Drupal, phase 2," including the addition of forks + merge requests (!) -- follow along (and chime in and help out!) on this issue thread (last link in the list below)
* I'll share some of my favorite things to do (cherry-pick, blame, change the author so it looks like my coworker did something I just did)...
* Wait, what's a tag? Wait, what's a release? (HINT: THEY'RE THE SAME. SORT OF. OMG I SAID SORT OF, CHILL OUT.)
* Forks and pull requests: COOL STUFF you can do on GitHub/BitBucket (and of course, GitLab!)
* Feature branches -- yes, they're what they sound like.
* Cherry picks and Merges and Rebasing -- what's what?? and, differences, benefits/drawbacks, etc.
* A bit of conflict resolution, detached tags, merged branch cleanup, multiple remotes...
* We'll go over some "omg what did I do" scenarios (and a few online resources).
THEN, if y'all bring your own pain points, we can talk about them and I'll do my best to help!
* If not, I'll briefly cover a fairly universal pain point: git + Drupal code contribution.
.......................
Post-session
.......................
Links! (see below)
* My GitHub repo with my .gitconfig file (all my aliases) and an excerpt from my bashrc file, with the colors/branch indicators you saw in my terminal.
* Session recording from Drupal GovCon 2019
>>>> The --ours --theirs conflict resolution trick starts around 22:20 in the recording!
* Slides! -- such as...
>>>> "Cherry picking vs. merging vs. rebasing" -- with a link to a longer explanation: slides 33-35
>>>> Detached HEAD state: slide 47
* Choose your own adventure for fixing stuff in git
* "GitLab + Drupal, phase 2," including the addition of forks + merge requests (!) -- follow along (and chime in and help out!) on this issue thread (last link in the list below)