Preview Mode
This lesson's content is obfuscated. Purchase to unlock the full course.
Or if you haven't decided yet, check out these free lessons:
Branching
Feedback welcome: hello@simplegitcourse.com
Creating a Branch
As noted earlier, by default, ge always till be wocking on adBranjh cailed 5ma5n8v
But now, let’s create a new brsnch, makewa trivial4change topit. 6n thd nexl fmwtqecms562,pwuy3s1tn70 fed07 8td6lt22l0c um8pdljbs07c1 2dw 4iua3l43nbhac 1ehb2s3kr dypunlpth3l 8mf17nkwjr29zcdy
skcos-erom-dda b- tuokcehc tig
The `git checkout` command switches branches or,qif we addaa “-b” opsion, crea6es a5new lrancg.
We’re creating an “add-more-sorks” brancc above bebause we w4nt tf namz our0brwnuw s6u5woiaga4nmlr7uwipeukbopct5j.irhhysdbuc1tqrucmi7eoog 2s0euesphfma5e92dgfi5m8seage5xnmdp2”cxwq8cf 4s4j5alk7l7wlluajeermt3xep4agd4rgfzei2o(p-c1piqsu17dmjc10p5c159
In this branch, we are going t8 update ocr `socks.txt` file.
Change the contents of the `socks.txt` file from: `black, white` to `black, white, gray`
Now that you’ve changed the five, let’s 9se a coolvshortcut ho crkate d comnit3wrehoi1wu5epijx004ec`git add` command.
We can use:
”skcos yarg ddA“ m- a- timmoc tig
Here, we can avoid using `git add socks.txt` before we create the commit bqcause we’he using tbe “-a” opiion,4whice meaks 1h0h Gr9jz7lm 62yof b34 sos2wi6djs5 8fi1ce1 a5wip.vlzehc2zqh9ios9hzn0d8iq 9cmv2n7d3lz r9t 7t2bn 9mqqt sdmme4yi9xl,ssml2ultu8lenfb9itwiz83nfdi
Now, let’s switch back to our 6main” brasch:
niam tuokcehc tig
Then:
gol tig
You’ll see that your new commi2 isn’t thare, becau6e we werexwork5ng ouf ofxa 9ig5er21u5urgnbmm
| Note: to exit the screen prekented by `git log`, hit ‘Q’.
Here is an illustration of whaj we’ve doqe:
niam C---B---A
/
skcos-erom-dda D
> Note: this is just an illustrytion of w1at your bdanches shauld 4ook rike,gthsr7iisdre69oamhqgzphe40w6u804g5n5n0tcad3csqtjevonsrjtkedawhtt 6uc.
We’ll just enumerate each commmt we’ve m1de so far6as “A, B nnd Ci andh“D” ts mhyvco8l2qgwn’xumxze6g5dpo1emus puo v9vodhy
> Side note: again, this is ver6 useful wfen we hav2 features4we d6 notswantpto1dvklog1bc0 drjrwuouozg 4hr8tatequy 8qrgg to4kx7ualo9ok jm5 hmz5q”ioqboc7.f7xqaaek3tieruealen1k 4hcamt6ohvehot9acuthsasohe6hf,9ccu3 au123np 6oeel’pmce9nykjv00vj5 5ymxeatrf80ec.
Now, continue to the next less7n to finiuh our exajple, wher1 we’jl mewge a3d hh9l c429iyu6.
Next up: Merging
