Git Micro Workflows: Little Red Riding Hood

Slide 1

Slide 1 text

Git Workflows: Little Red Riding Hood !

Slide 2

Slide 2 text

Git Micro Workflows: Little Red Riding Hood !

Slide 3

Slide 3 text

Git Micro Workflows: Little Red Riding Hood !

Slide 4

Slide 4 text

Travis Douce [email protected]! [email protected]! Twitter: @travisdouce GitHub: tdouce

Slide 5

Slide 5 text

Git Micro Workflows: Little Red Riding Hood !

Slide 6

Slide 6 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 7

Slide 7 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 8

Slide 8 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 9

Slide 9 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 10

Slide 10 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 11

Slide 11 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 12

Slide 12 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 13

Slide 13 text

The better you are with your tools, the better developer you will be

Slide 14

Slide 14 text

What is Git?

Slide 15

Slide 15 text

Distributed Version Control What is Git?

Slide 16

Slide 16 text

Distributed Version Control What is Git?

Slide 17

Slide 17 text

essay.doc

Slide 18

Slide 18 text

essay.doc essay_intro_1.doc

Slide 19

Slide 19 text

essay_intro_2.doc essay.doc essay_intro_1.doc

Slide 20

Slide 20 text

essay_intro_body_3.doc essay.doc essay_intro_1.doc essay_intro_2.doc

Slide 21

Slide 21 text

The Brothers Grimm Wilhelm Jacob

Slide 22

Slide 22 text

Getting Started

Slide 23

Slide 23 text

Create Repo

Slide 24

Slide 24 text

Create Repo Repository created in this directory

Slide 25

Slide 25 text

Status Status of repository

Slide 26

Slide 26 text

Status

Slide 27

Slide 27 text

Status

Slide 28

Slide 28 text

Create file Create ﬁle little_red_riding_hood.txt

Slide 29

Slide 29 text

Status

Slide 30

Slide 30 text

Status

Slide 31

Slide 31 text

Status

Slide 32

Slide 32 text

Add Color Conﬁgure output with color

Slide 33

Slide 33 text

Add Color Global

Slide 34

Slide 34 text

Add Color Yes, color the output

Slide 35

Slide 35 text

Status

Slide 36

Slide 36 text

Status

Slide 37

Slide 37 text

Track Track changes to ﬁle

Slide 38

Slide 38 text

Track Name of ﬁle

Slide 39

Slide 39 text

Status

Slide 40

Slide 40 text

Staged

Slide 41

Slide 41 text

Commit Commit all ﬁles in staging ! to local repository

Slide 42

Slide 42 text

opens editor

Slide 43

Slide 43 text

* See end of slides for writing great commit messages commit message

Slide 44

Slide 44 text

* See end of slides for writing great commit messages extended description

Slide 45

Slide 45 text

save and close

Slide 46

Slide 46 text

Commit It worked!

Slide 47

Slide 47 text

Status

Slide 48

Slide 48 text

Status

Slide 49

Slide 49 text

Jacob writes … The Little Red Riding Hood

Slide 50

Slide 50 text

little_red_riding_hood.txt

Slide 51

Slide 51 text

little_red_riding_hood.txt

Slide 52

Slide 52 text

little_red_riding_hood.txt

Slide 53

Slide 53 text

save and close

Slide 54

Slide 54 text

Status

Slide 55

Slide 55 text

Modified

Slide 56

Slide 56 text

Stage

Slide 57

Slide 57 text

Staging? What’s the purpose of

Slide 58

Slide 58 text

Staging? All files in staging will be included in next commit What’s the purpose of

Slide 59

Slide 59 text

Status

Slide 60

Slide 60 text

Status

Slide 61

Slide 61 text

Commit Commit all ﬁles in staging ! to local repository

Slide 62

Slide 62 text

opens editor opens editor save opens editor

Slide 63

Slide 63 text

opens editor opens editor save commit message

Slide 64

Slide 64 text

opens editor opens editor save save and close

Slide 65

Slide 65 text

Commit

Slide 66

Slide 66 text

Status

Slide 67

Slide 67 text

Status

Slide 68

Slide 68 text

Status

Slide 69

Slide 69 text

Work Flow # 1

Slide 70

Slide 70 text

Work Flow # 1 Modified Staged Committed

Slide 71

Slide 71 text

Work Flow # 1 Modified Staged Committed

Slide 72

Slide 72 text

Work Flow # 1 Modified Staged Committed

Slide 73

Slide 73 text

Jacob writes an introduction

Slide 74

Slide 74 text

Jacob writes an introduction and that is HARD

Slide 75

Slide 75 text

little_red_riding_hood.txt

Slide 76

Slide 76 text

little_red_riding_hood.txt

Slide 77

Slide 77 text

save and close

Slide 78

Slide 78 text

Status

Slide 79

Slide 79 text

Modified

Slide 80

Slide 80 text

Stage

Slide 81

Slide 81 text

Status

Slide 82

Slide 82 text

Staged

Slide 83

Slide 83 text

Commit

Slide 84

Slide 84 text

opens editor

Slide 85

Slide 85 text

commit message

Slide 86

Slide 86 text

Commit

Slide 87

Slide 87 text

little_red_riding_hood.txt

Slide 88

Slide 88 text

little_red_riding_hood.txt

Slide 89

Slide 89 text

little_red_riding_hood.txt

Slide 90

Slide 90 text

little_red_riding_hood.txt

Slide 91

Slide 91 text

It’s good, but … little_red_riding_hood.txt

Slide 92

Slide 92 text

It’s good, but … save and close

Slide 93

Slide 93 text

Make a WIP commit

Slide 94

Slide 94 text

Make a WIP commit Work In Progress

Slide 95

Slide 95 text

Make a WIP commit Work In Progress Just a convention

Slide 96

Slide 96 text

Status

Slide 97

Slide 97 text

Status

Slide 98

Slide 98 text

Stage

Slide 99

Slide 99 text

Commit Commit and provide message

Slide 100

Slide 100 text

Commit Commit message

Slide 101

Slide 101 text

Commit

Slide 102

Slide 102 text

little_red_riding_hood.txt

Slide 103

Slide 103 text

little_red_riding_hood.txt

Slide 104

Slide 104 text

little_red_riding_hood.txt

Slide 105

Slide 105 text

little_red_riding_hood.txt

Slide 106

Slide 106 text

Yes, this is it! little_red_riding_hood.txt

Slide 107

Slide 107 text

Yes, this is it! save and close

Slide 108

Slide 108 text

Status

Slide 109

Slide 109 text

Modified

Slide 110

Slide 110 text

Stage

Slide 111

Slide 111 text

Commit Commit and provide message

Slide 112

Slide 112 text

Commit Commit message

Slide 113

Slide 113 text

Commit

Slide 114

Slide 114 text

Work Flow # 2

Slide 115

Slide 115 text

Work Flow # 2 Make WIP commits

Slide 116

Slide 116 text

Work Flow # 2 Developing complicated features Make WIP commits

Slide 117

Slide 117 text

Work Flow # 2 Preserve each implementation Make WIP commits Developing complicated features

Slide 118

Slide 118 text

Git history

Slide 119

Slide 119 text

Git history (and the many ways to view it)

Slide 120

Slide 120 text

Understanding git history

Slide 121

Slide 121 text

Log

Slide 122

Slide 122 text

Log

Slide 123

Slide 123 text

Log Newest Oldest

Slide 124

Slide 124 text

Log #5 Newest Oldest

Slide 125

Slide 125 text

Log #4 Newest Oldest

Slide 126

Slide 126 text

Log #3 Newest Oldest

Slide 127

Slide 127 text

Log #2 Newest Oldest

Slide 128

Slide 128 text

Log #1 Newest Oldest

Slide 129

Slide 129 text

Log Author Newest Oldest

Slide 130

Slide 130 text

Log Date Newest Oldest

Slide 131

Slide 131 text

Log Commit message Newest Oldest

Slide 132

Slide 132 text

What are these?

Slide 133

Slide 133 text

These are shas Unique identiﬁer! for commit

Slide 134

Slide 134 text

Another way to view history

Slide 135

Slide 135 text

Log with patch A more details view of history

Slide 136

Slide 136 text

Log with patch Patch ﬂag

Slide 137

Slide 137 text

Log with patch Patch *Displaying most recent commit only

Slide 138

Slide 138 text

And, another way to view history

Slide 139

Slide 139 text

Log as graph *lg alias at end of slides Jacob conﬁgured a git alias, lg. When entered, history is displayed a graph

Slide 140

Slide 140 text

Log as graph Newest Oldest

Slide 141

Slide 141 text

Log as graph Newest Oldest

Slide 142

Slide 142 text

Log as graph Commit message Newest Oldest

Slide 143

Slide 143 text

Log as graph Author Newest Oldest

Slide 144

Slide 144 text

Log as graph Date Newest Oldest

Slide 145

Slide 145 text

Newest Oldest Log as graph

Slide 146

Slide 146 text

Newest Oldest Log as graph

Slide 147

Slide 147 text

Newest Oldest Log as graph

Slide 148

Slide 148 text

Newest Oldest Log as graph

Slide 149

Slide 149 text

Newest Oldest Log as graph

Slide 150

Slide 150 text

Newest Oldest Log as graph

Slide 151

Slide 151 text

Newest Oldest Log as graph

Slide 152

Slide 152 text

Newest Oldest Log as graph

Slide 153

Slide 153 text

Newest Oldest Log as graph

Slide 154

Slide 154 text

What is HEAD? HEAD Parent of next commit

Slide 155

Slide 155 text

What is HEAD? 1 2 HEAD, master Newest Oldest

Slide 156

Slide 156 text

1 2 HEAD, master 3 Next commit is on top of HEAD What is HEAD? Newest Oldest

Slide 157

Slide 157 text

1 2 HEAD, master 3 What is HEAD? Newest Oldest

Slide 158

Slide 158 text

1 2 HEAD, master 3 What is HEAD? Newest Oldest

Slide 159

Slide 159 text

1 2 HEAD, master 3 4 Next commit is on top of HEAD What is HEAD? Newest Oldest

Slide 160

Slide 160 text

1 2 HEAD, master 3 4 What is HEAD? Newest Oldest

Slide 161

Slide 161 text

1 2 HEAD, master 3 4 What is HEAD? Newest Oldest

Slide 162

Slide 162 text

What is master? master Default branch (we’ll cover branches later)

Slide 163

Slide 163 text

Understanding git history

Slide 164

Slide 164 text

Understanding log as graph master has commits master

Slide 165

Slide 165 text

Understanding log as graph master has commits

Slide 166

Slide 166 text

Understanding log as graph master has commits

Slide 167

Slide 167 text

Understanding log as graph master has commits

Slide 168

Slide 168 text

Understanding log as graph master has commits

Slide 169

Slide 169 text

Understanding log as graph master has commits

Slide 170

Slide 170 text

Understanding log as graph master has commits

Slide 171

Slide 171 text

Understanding log as graph master has commits

Slide 172

Slide 172 text

Understanding log as graph master has commits

Slide 173

Slide 173 text

The ugly history

Slide 174

Slide 174 text

3 commits about writing introduction Ugly history

Slide 175

Slide 175 text

Proposed clean history 3 commits about writing introduction 1 commit

Slide 176

Slide 176 text

Why do we care about a clean history?

Slide 177

Slide 177 text

Re-write history

Slide 178

Slide 178 text

Start rewriting history at! Adds introductory sentence commit Log as a graph

Slide 179

Slide 179 text

Log as a graph Start rewriting history at! Adds introductory sentence commit

Slide 180

Slide 180 text

Log as a graph Start rewriting history at! Adds introductory sentence commit

Slide 181

Slide 181 text

Log as a graph Start rewriting history at! Adds introductory sentence commit

Slide 182

Slide 182 text

Log as a graph Start rewriting history at! Adds introductory sentence commit

Slide 183

Slide 183 text

copy sha to clipboard Log as a graph

Slide 184

Slide 184 text

Rebase: interactive Re-write history

Slide 185

Slide 185 text

Interactive mode Rebase: interactive

Slide 186

Slide 186 text

sha from clipboard Rebase: interactive

Slide 187

Slide 187 text

Not child of sha, but this sha Rebase: interactive

Slide 188

Slide 188 text

What will happen? (theoretically)

Slide 189

Slide 189 text

Rebase: Interactive 1 2 3 4 HEAD, master Newest Oldest

Slide 190

Slide 190 text

Rebase: Interactive HEAD, master Newest Oldest Start rebasing at! this commit 1 2 3 4

Slide 191

Slide 191 text

2 3 4 HEAD, master 1 Rebase: Interactive

Slide 192

Slide 192 text

2 3 4 HEAD, master 1 Rebase: Interactive 2 3 4

Slide 193

Slide 193 text

Meld together 1 Rebase: Interactive 2 3 4 HEAD, master 2 3 4

Slide 194

Slide 194 text

5 New sha 1 Rebase: Interactive 2 3 4 HEAD, master

Slide 195

Slide 195 text

5 1 Rebase: Interactive 2 3 4 HEAD, master

Slide 196

Slide 196 text

5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master

Slide 197

Slide 197 text

Created a new base 5 1 HEAD, master Rebase: Interactive 2 3 4 HEAD, master

Slide 198

Slide 198 text

Rebase: interactive

Slide 199

Slide 199 text

opens editor

Slide 200

Slide 200 text

Newest Oldest

Slide 201

Slide 201 text

Newest Oldest

Slide 202

Slide 202 text

Newest Oldest

Slide 203

Slide 203 text

Newest Oldest

Slide 204

Slide 204 text

No content

Slide 205

Slide 205 text

No content

Slide 206

Slide 206 text

No content

Slide 207

Slide 207 text

No content

Slide 208

Slide 208 text

f f

Slide 209

Slide 209 text

f f save and close

Slide 210

Slide 210 text

Rebase: interactive

Slide 211

Slide 211 text

Rebase: interactive It worked!

Slide 212

Slide 212 text

Rebase: interactive $ git rebase --abort If things go wrong!

Slide 213

Slide 213 text

Rebase Double edged sword

Slide 214

Slide 214 text

Understanding git history

Slide 215

Slide 215 text

Log as a graph

Slide 216

Slide 216 text

Log as a graph

Slide 217

Slide 217 text

Log as a graph 3 commits about writing introduction 1 commit

Slide 218

Slide 218 text

8979394 != ed04ae2 Log as a graph

Slide 219

Slide 219 text

Work Flow # 3

Slide 220

Slide 220 text

Work Flow # 3 Keep a clean history

Slide 221

Slide 221 text

Work Flow # 3 (Not so much how you got there, but sometimes I do) I want to know what you did Keep a clean history

Slide 222

Slide 222 text

Work Flow # 3 (Not so much how you got there, but sometimes I do) Helps with code reviews by revealing intent I want to know what you did Keep a clean history

Slide 223

Slide 223 text

Work Flow # 3 (Not so much how you got there, but sometimes I do) Helps with code reviews by revealing intent Can rebase to organize history I want to know what you did Keep a clean history

Slide 224

Slide 224 text

3 a.m. and Jacob is

Slide 225

Slide 225 text

little_red_riding_hood.txt

Slide 226

Slide 226 text

little_red_riding_hood.txt

Slide 227

Slide 227 text

little_red_riding_hood.txt

Slide 228

Slide 228 text

Status

Slide 229

Slide 229 text

Modified

Slide 230

Slide 230 text

Commit Stage and commit

Slide 231

Slide 231 text

open

Slide 232

Slide 232 text

commit message

Slide 233

Slide 233 text

save and close

Slide 234

Slide 234 text

Commit

Slide 235

Slide 235 text

Log with patch

Slide 236

Slide 236 text

Log with patch Displaying most recent commit only

Slide 237

Slide 237 text

Jacob realizes commit error

Slide 238

Slide 238 text

Jacob fixes commit error

Slide 239

Slide 239 text

Jacob fixes commit error Undo last commit

Slide 240

Slide 240 text

Understanding git history

Slide 241

Slide 241 text

Proposed Undo

Slide 242

Slide 242 text

Proposed Undo Erroneous commit

Slide 243

Slide 243 text

Proposed Undo Commit prior to error

Slide 244

Slide 244 text

Proposed Undo Move HEAD and master backwards one commit

Slide 245

Slide 245 text

Proposed Undo Move HEAD and master backwards one commit

Slide 246

Slide 246 text

Reset Move HEAD back 1 commit

Slide 247

Slide 247 text

Move HEAD back 1 commit (but keep changes) Reset

Slide 248

Slide 248 text

HEAD Reset

Slide 249

Slide 249 text

Backwards 1 commit Reset

Slide 250

Slide 250 text

Reset It worked!

Slide 251

Slide 251 text

Log as graph

Slide 252

Slide 252 text

Log as graph

Slide 253

Slide 253 text

Log as graph

Slide 254

Slide 254 text

Log as graph

Slide 255

Slide 255 text

Jacob rewrites erroneous sentence

Slide 256

Slide 256 text

little_red_riding_hood.txt

Slide 257

Slide 257 text

little_red_riding_hood.txt

Slide 258

Slide 258 text

little_red_riding_hood.txt

Slide 259

Slide 259 text

little_red_riding_hood.txt

Slide 260

Slide 260 text

save and close

Slide 261

Slide 261 text

Status

Slide 262

Slide 262 text

Modified

Slide 263

Slide 263 text

Stage

Slide 264

Slide 264 text

Commit with verbose View changes while writing commit message

Slide 265

Slide 265 text

Commit with verbose Verbose Flag

Slide 266

Slide 266 text

open

Slide 267

Slide 267 text

commit message

Slide 268

Slide 268 text

save and close

Slide 269

Slide 269 text

Commit with verbose

Slide 270

Slide 270 text

Commit with verbose ALWAYS

Slide 271

Slide 271 text

Commit with verbose Verbose commit with $ git ci

Slide 272

Slide 272 text

Commit with verbose Global

Slide 273

Slide 273 text

Commit with verbose When enter $ git ci

Slide 274

Slide 274 text

Commit with verbose Then commit with —verbose

Slide 275

Slide 275 text

Work Flow # 4

Slide 276

Slide 276 text

Work Flow # 4 AlWAYS! Verbose commit

Slide 277

Slide 277 text

Work Flow # 4 Write better commit messages AlWAYS! Verbose commit

Slide 278

Slide 278 text

Work Flow # 4 Write better commit messages Reduce erroneous commits Verbose commit AlWAYS!

Slide 279

Slide 279 text

Jacob writes body of Little Red Riding Hood using feature branches

Slide 280

Slide 280 text

Jacob writes body of Little Red Riding Hood using feature branches

Slide 281

Slide 281 text

List branches List all branches in repository

Slide 282

Slide 282 text

List branches On master branch Remember, master is the default branch

Slide 283

Slide 283 text

Branches Create branch and switch to it

Slide 284

Slide 284 text

Branches Branch name

Slide 285

Slide 285 text

Branches authorFirstName_authorLastName/description_of_branch Branch name

Slide 286

Slide 286 text

authorFirstName_authorLastName/description_of_branch Branches Branch name

Slide 287

Slide 287 text

Branches authorFirstName_authorLastName/description_of_branch Branch name

Slide 288

Slide 288 text

Branches authorFirstName_authorLastName/description_of_branch Branch name

Slide 289

Slide 289 text

Branches authorFirstName_authorLastName/description_of_branch Branch name

Slide 290

Slide 290 text

Branches jacob_grimm/body Branch name

Slide 291

Slide 291 text

Branches jacob_grimm/body Branch name

Slide 292

Slide 292 text

Branches jacob_grimm/body Branch name

Slide 293

Slide 293 text

Branches jacob_grimm/body Branch name

Slide 294

Slide 294 text

Branches jacob_grimm/body Branch name

Slide 295

Slide 295 text

Branches Just a convention Branch name

Slide 296

Slide 296 text

Branches It worked!! Created jacob_grimm/body and switched to it

Slide 297

Slide 297 text

Branches List all branches in repository

Slide 298

Slide 298 text

Branches 2 branches

Slide 299

Slide 299 text

Branches On jacob_grimm/body branch

Slide 300

Slide 300 text

Understanding git history

Slide 301

Slide 301 text

Log as graph

Slide 302

Slide 302 text

Log as graph

Slide 303

Slide 303 text

HEAD is at commit Log as graph

Slide 304

Slide 304 text

master is at commit Log as graph

Slide 305

Slide 305 text

HEAD is at commit jacob_grimm/body Log as graph

Slide 306

Slide 306 text

master and jacob_grimm/body have commits Log as graph

Slide 307

Slide 307 text

master and jacob_grimm/body have commits Log as graph

Slide 308

Slide 308 text

master and jacob_grimm/body have commits Log as graph

Slide 309

Slide 309 text

master and jacob_grimm/body have commits Log as graph

Slide 310

Slide 310 text

What branch am I on? You are here

Slide 311

Slide 311 text

What branch am I on?

Slide 312

Slide 312 text

Display branch in prompt * bash script at end of slides

Slide 313

Slide 313 text

Display branch in prompt Always display branch name in prompt

Slide 314

Slide 314 text

little_red_riding_hood.txt

Slide 315

Slide 315 text

little_red_riding_hood.txt

Slide 316

Slide 316 text

little_red_riding_hood.txt save and close

Slide 317

Slide 317 text

Status

Slide 318

Slide 318 text

Modified

Slide 319

Slide 319 text

Commit Stage and commit

Slide 320

Slide 320 text

open

Slide 321

Slide 321 text

commit message

Slide 322

Slide 322 text

save and close

Slide 323

Slide 323 text

Commit

Slide 324

Slide 324 text

The history of master and jacob_grimm/body have diverged

Slide 325

Slide 325 text

Understanding git history

Slide 326

Slide 326 text

Log as graph

Slide 327

Slide 327 text

jacob_grimm/body has commits Log as graph

Slide 328

Slide 328 text

jacob_grimm/body has commits Log as graph

Slide 329

Slide 329 text

jacob_grimm/body has commits Log as graph

Slide 330

Slide 330 text

jacob_grimm/body has commits Log as graph

Slide 331

Slide 331 text

jacob_grimm/body has commits Log as graph

Slide 332

Slide 332 text

jacob_grimm/body has commits Log as graph

Slide 333

Slide 333 text

master has commits Log as graph

Slide 334

Slide 334 text

master has commits Log as graph

Slide 335

Slide 335 text

master has commits Log as graph

Slide 336

Slide 336 text

master has commits Log as graph

Slide 337

Slide 337 text

master has commits Log as graph

Slide 338

Slide 338 text

master does NOT have commit Log as graph

Slide 339

Slide 339 text

Work Flow # 5

Slide 340

Slide 340 text

Work Flow # 5 Feature branches

Slide 341

Slide 341 text

Work Flow # 5 Feature branches Isolate feature development

Slide 342

Slide 342 text

Work Flow # 5 Feature branches Isolate feature development Easily determine author of feature

Slide 343

Slide 343 text

Jacob finishes jacob_grimm/body

Slide 344

Slide 344 text

Decides it should be in the story of Little Red Riding Hood

Slide 345

Slide 345 text

Incorporate jacob_grimm/body into master

Slide 346

Slide 346 text

Switch branches Currently, on jacob_grimm/body branch

Slide 347

Slide 347 text

Switch branches Switch to master branch

Slide 348

Slide 348 text

Switch branches Branch name to switch to

Slide 349

Slide 349 text

Switch branches It worked!! Switched to master

Slide 350

Slide 350 text

Merge Incorporate jacob_grimm/body into master

Slide 351

Slide 351 text

Branch name to incorporate into master Merge

Slide 352

Slide 352 text

What will happen? (theoretically)

Slide 353

Slide 353 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 354

Slide 354 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 355

Slide 355 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 356

Slide 356 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 357

Slide 357 text

5 1 2 3 4 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 358

Slide 358 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Newest Oldest

Slide 359

Slide 359 text

5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest

Slide 360

Slide 360 text

5 1 2 3 4 6 , HEAD, master jacob_grimm/body Newest Oldest

Slide 361

Slide 361 text

Merge

Slide 362

Slide 362 text

Merge It worked!

Slide 363

Slide 363 text

Merge Fast Forward merge strategy

Slide 364

Slide 364 text

if possible. Git will Fast-foward merge,

Slide 365

Slide 365 text

Understanding git history

Slide 366

Slide 366 text

Log as graph

Slide 367

Slide 367 text

master and jacob_grimm/body have commits Log as graph

Slide 368

Slide 368 text

Log as graph master and jacob_grimm/body have commits

Slide 369

Slide 369 text

Log as graph master and jacob_grimm/body have commits

Slide 370

Slide 370 text

Log as graph master and jacob_grimm/body have commits

Slide 371

Slide 371 text

Log as graph master and jacob_grimm/body have commits

Slide 372

Slide 372 text

Log as graph master and jacob_grimm/body have commits

Slide 373

Slide 373 text

What commits originated in jacob_grimm/body?

Slide 374

Slide 374 text

Log as graph

Slide 375

Slide 375 text

What commits originated in jacob_grimm/body? ¯\_(π)_/¯

Slide 376

Slide 376 text

Make it easy to determine the commits that originated in jacob_grimm/body

Slide 377

Slide 377 text

with merge bubbles Make it easy to determine the commits that originated in jacob_grimm/body

Slide 378

Slide 378 text

What is a merge bubble?

Slide 379

Slide 379 text

What is a merge bubble? We’ll see in a moment :)

Slide 380

Slide 380 text

First, Jacob must undo the merge

Slide 381

Slide 381 text

Log as graph

Slide 382

Slide 382 text

Log as graph

Slide 383

Slide 383 text

Log as graph Find commit before merge

Slide 384

Slide 384 text

Log as graph Find commit before merge

Slide 385

Slide 385 text

Log as graph Find commit before merge

Slide 386

Slide 386 text

Log as graph Find commit before merge

Slide 387

Slide 387 text

Log as graph Copy sha to clipboard

Slide 388

Slide 388 text

Reset Move HEAD back to commit

Slide 389

Slide 389 text

Reset Discard changes in commit

Slide 390

Slide 390 text

Paste sha from clipboard Reset

Slide 391

Slide 391 text

It worked!

Slide 392

Slide 392 text

Log as graph

Slide 393

Slide 393 text

Log as graph

Slide 394

Slide 394 text

Log as graph

Slide 395

Slide 395 text

As if merge never happened

Slide 396

Slide 396 text

Again, incorporate jacob_grimm/body into master !

Slide 397

Slide 397 text

And, this time create a merge bubble

Slide 398

Slide 398 text

Merge Incorporate jacob_grimm/body into master! and make a merge bubble

Slide 399

Slide 399 text

Branch to merge into master Merge

Slide 400

Slide 400 text

Do not use Fast-forward strategy Merge

Slide 401

Slide 401 text

Merge Do not use Fast-forward strategy Create a merge bubble!

Slide 402

Slide 402 text

What will happen? (theoretically)

Slide 403

Slide 403 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body

Slide 404

Slide 404 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body

Slide 405

Slide 405 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body

Slide 406

Slide 406 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body

Slide 407

Slide 407 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body Merge commit 7

Slide 408

Slide 408 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body 7

Slide 409

Slide 409 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Merge Bubble

Slide 410

Slide 410 text

1 2 3 4 5 6 HEAD, master jacob_grimm/body 7 Originated from jacob_grimm/body

Slide 411

Slide 411 text

Merge with Recursive strategy

Slide 412

Slide 412 text

Merge

Slide 413

Slide 413 text

merge commit opens editor

Slide 414

Slide 414 text

auto populates merge commit message

Slide 415

Slide 415 text

save and close

Slide 416

Slide 416 text

Merge

Slide 417

Slide 417 text

It worked! Merge

Slide 418

Slide 418 text

Merged with recursive strategy Merge

Slide 419

Slide 419 text

Understanding git history

Slide 420

Slide 420 text

Log as graph

Slide 421

Slide 421 text

Log as graph

Slide 422

Slide 422 text

Merge bubble Log as graph

Slide 423

Slide 423 text

Originated from jacob_grimm/body Log as graph

Slide 424

Slide 424 text

Made it easy to determine origin of commit

Slide 425

Slide 425 text

merge bubble == feature branch

Slide 426

Slide 426 text

HEAD and master are at commit Log as graph

Slide 427

Slide 427 text

Merge commit Log as graph HEAD and master are at commit

Slide 428

Slide 428 text

Log as graph master has commits

Slide 429

Slide 429 text

master has commits Log as graph

Slide 430

Slide 430 text

master has commits Log as graph

Slide 431

Slide 431 text

master has commits Log as graph

Slide 432

Slide 432 text

master has commits Log as graph

Slide 433

Slide 433 text

master has commits Log as graph

Slide 434

Slide 434 text

jacob_grimm/body has commits Log as graph

Slide 435

Slide 435 text

jacob_grimm/body has commits Log as graph

Slide 436

Slide 436 text

jacob_grimm/body has commits Log as graph

Slide 437

Slide 437 text

jacob_grimm/body has commits Log as graph

Slide 438

Slide 438 text

jacob_grimm/body has commits Log as graph

Slide 439

Slide 439 text

jacob_grimm/body does NOT have merge commit Log as graph

Slide 440

Slide 440 text

Work Flow # 6 No Fast Forward merge strategy

Slide 441

Slide 441 text

Work Flow # 6 Use when merging feature branches No Fast Forward merge strategy

Slide 442

Slide 442 text

Work Flow # 6 Use when merging feature branches Easily determine from which feature branch a commit originated No Fast Forward merge strategy

Slide 443

Slide 443 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 444

Slide 444 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 445

Slide 445 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 446

Slide 446 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 447

Slide 447 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 448

Slide 448 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 449

Slide 449 text

What is Git? Create repo Basic workflow Understanding history Rebase (interactive) Branches Merge Remotes Merge vs Rebase

Slide 450

Slide 450 text

Install Git! http://git-scm.com/book/en/v2/Getting-Started-Installing-Git http://kj-prince.com/code/install-git-mac-osx-homebrew/ Git Pro! http://git-scm.com/book/en/v2 Bash Completion! https://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion https://conra.dk/2013/01/18/git-on-osx.html Display git branch name in prompt! http://stackoverflow.com/questions/17333531/how-can-i-display-the-current- branch-and-folder-path-in-terminal Git Workflow Videos with Andy Lindeman! http://vimeo.com/33166064 http://vimeo.com/33165748 Well formed commit messages! http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html http://robots.thoughtbot.com/5-useful-tips-for-a-better-commit-message Resources