Git for Professionals Tutorial - Tools & Concepts for Mastering Version Control with Git

Рет қаралды 1,619,194

Күн бұрын

Git has the power to make you a better software developer. But you'll have to go beyond the basic "commit, push, pull" to use it effectively! In this course, we'll look at some of the more advanced concepts and tools to make you more productive and confident with Git.
This course focuses on using Git with the command line.
✏️ This course was created by Tobias Günther from Tower. You can download Tower's Git desktop UI here: www.git-tower.com
⭐️ Course Contents ⭐️
⌨️ (00:00) Introduction
⌨️ (00:52) Hosted by Tower
⌨️ (01:27) The perfect commit
⌨️ (08:07) Branching strategies
⌨️ (17:16) Pull requests
⌨️ (24:07) Merge conflicts
⌨️ (33:48) Merge vs. rebase
⌨️ (40:05) The Advanced Git Kit: www.git-tower.com/learn/git/a...
Correction:
23:37 Do NOT create a pull request to the Rails repo. This is just a demonstration and every frivolous PR creates extra work for their volunteer team.

Пікірлер: 472

@tdew11 2 жыл бұрын

Your voice was so relaxing it put me to sleep but when I woke up I knew how rebasing works, so thank you!

@coenfuse 2 жыл бұрын

Lmao

@ahmadjamalmughal47 2 жыл бұрын

😂

@nibbanapatipada9538 2 жыл бұрын

same here!

@cokeantonio 2 жыл бұрын

He sounds like christoph waltz. So soothing!

@Geddy107 2 жыл бұрын

@@cokeantonio Came to the comments just to see if someone else was thinking it.

@josephgutierrez8430 2 жыл бұрын

40 minutes sounds like a long time, but it was all jam packed with legitimate information and no fluff. Great video. Watched the whole thing and didn't even notice the time.

@KuroManX Жыл бұрын

for me 40 min is when the guy is straight to the infos and not 5+ hours of beginner talk

@frk0788 Жыл бұрын

Yeah! that to me as well wondering why could it be, maybe the timing and pacing of the video is just fenomenal.

@vicLord-lh6ob 3 ай бұрын

Indeed it was quality time

@fatihhguvenn 11 күн бұрын

1.25x speed is optimal

@fireballgfx 2 жыл бұрын

I was not aware of the -p parameter who give me the ability to add only a specific part to the staging area.

@rxditay 2 жыл бұрын

@toihirhalim 2 жыл бұрын

I had to cut, commit and then re-paste but now this powerful "-p" is awesome

@ahmadjamalmughal47 2 жыл бұрын

I swear me neither.

@depressedknight369 2 жыл бұрын

really.. 😶

@vorrnth8734 2 жыл бұрын

I usually do that kind of stuff in git gui.

@talkohavy Жыл бұрын

I consider myself as pretty profficiant with git, yet I'm doing this thing where i'm occasionally revisiting known technologies to maybe learn some new things. Anyhow, just I wanted to say that this 40-minutes long video was ALL WORTH IT just for the sake of learning about the git add with the -p flag to only mark some parts of a file to be included in the commit :) Love it! definitely gonna use it in the future♥ Thank you!

@s.i.m.c.a Жыл бұрын

this is an introductory video, and "-p" flag is useless. As in the real work, most ppl uses temporary local branch with a logical name for each commit, thus no need to deal with staging or splitting commits especially in case of 50+ modified files.

@talkohavy Жыл бұрын

@@s.i.m.c.a Plus, it doesn't work very well. Since posting this comment I tried using it, and man it sucks... sometimes it takes 2 or 3 rows and considers them as ONE CHANGE! Take it or leave it! When in fact each row is a chance on it's own, where I want only one of them. And yeah, the point you made is also valid. Haven't used it since. But it's nice to know all these "secret" git command. like git rerere for instance 😉

@dannnsss8034 Жыл бұрын

Still so confused about rebase.

@Cameron655 Жыл бұрын

@@dannnsss8034 Your're not the only person out here. I've read the documentation for "git rerere" a dozen times and I'm still confused. I mean, I use git every day, and I think I'm proficient, but there are some very dark corners.

@vladyslavkarpenko9372 Жыл бұрын

@@talkohavy Agree that git add - p not so useful, but just because it's command line interface makes harder to work out staging line by line instead of by blocks of code. Remember a lot of an optional "one letter" decisions in the interactive prompt? In this video the author just skips explanation of all options to just yES (accept incoming block of changes to stage) and nO (do not stage this whole block). The most IDEs (e. g. VS Code) gives you a useful interface to actually select which lines you would like to stage on commit. Of course sometimes happens that you needed to stage only partial change of the line, but that rare cases. In that situation you may modify line to one state, stage it and after that reimplement partial change that must be separated.

@architjain6749 2 жыл бұрын

"You can live a happy Git life just using merge", I felt it!

@MarcinScholke 2 ай бұрын

as long as no conflicts are there

@burgerchild Жыл бұрын

This would have been an excellent 40 minute class in college. The knowledge is there in college, just spread out. this is clear and consise. Thanks for your work!

@w1atrak1ng Жыл бұрын

Agreed

@stevenschelling8452 2 жыл бұрын

Phenomenal video. These types of dev tutorials can be so dry but you made it highly visible and explained things simply and clearly. Thanks!

@zachsandvik1867 2 жыл бұрын

My compliments to the speaker. You are a very good teacher. Speaking in a relaxed way makes listening to you a huge pleasure in following your explanations. Top!!!

@OKBumble Жыл бұрын

Bravo! Not only the action steps to complete certain actions, but "why" and an explanation of what actually happens when you do! Nicely done.

@vandana1145 2 жыл бұрын

The way you narrated the whole concept is so awesome, everything got stick to the mind perfectly. Thanks for this beautiful content.

@depressedknight369 2 жыл бұрын

my thoughts exactly

@cesarsalas6444 10 ай бұрын

La forma en que narraste todo el concepto es tan increíble que todo se quedó perfectamente en la mente.

@iTor 9 ай бұрын

I closed my eyes for a moment there and I believe it was truly Christoph Waltz teaching me about Git.

@AndrewEsh 3 ай бұрын

I got that too. I was in the bar in Django Unchained, having a beer with Dr. King Schultz, having bounty hunting explained to me.

@erikgrundy 2 жыл бұрын

I'm quite a big fan of "git add -i". This lets you do all the hunk-specific addition, while avoiding having to retype commands

@braulioandre2918 2 жыл бұрын

I've just realized I didn't know Git at all lol. Thank so much for this.

@pranayp1950 2 жыл бұрын

Thank you so much for this man. Your content is a better than a lot of paid courses out there !

@GhostStyle007 Жыл бұрын

A very important consideration when you start spliting a file into multiple commits is to be very careful about not breaking or creating errors into one of the two generated commits, especially if a CI pipeline is using them.

@compScientizt 2 жыл бұрын

Thank you so much, Guru Ji💖🙏, You are an amazing teacher! You taught us so much useful information in such a short period and made it a lot easier to understand. Thanks a lot for providing us free education. I'm the greatest fan of your work and knowledge. Keep it up! 🙌 This is one of my most favorite channels on KZfaq 😍🥰

@codefacileWK 2 жыл бұрын

Thank you for this amazing course ! Perfect narration !

@shafayat1004 2 жыл бұрын

This video came just before our first group project for my uni course. Thanks!

@ahmadjamalmughal47 2 жыл бұрын

Good luck man.

@giovannichrysostomo2368 2 жыл бұрын

First I'd like to thank you FCC and thank all your collaborators that bring content to us! I promise that I'll try to get as much experience as I can to get better and I will retribute all your efforts. Regards from Brazil!

@ashley_engle 2 жыл бұрын

Super well articulated thorough and solid knowledge here. Thank you! 💕

@clancy-sigal 2 жыл бұрын

This is an awesome intro on some intermediate git techniques. Looking forward to the Advacned Git tips and tricks!

@eelguneezmemmedov1671 2 жыл бұрын

@meiyachan8483 2 жыл бұрын

Well presented and well explained! Clarified my long-time confusion of merge and rebase

@javafun 2 жыл бұрын

I can concentrate well while watch this video, and understood more quickly and deeply, because of your speaking speed that is more comfortable for me. Thanks a lot.

@karansmittal 2 жыл бұрын

The video on branching and now this video. Thank you so much for making these difficult concepts easy for me.

@poischiche2933 2 жыл бұрын

I'd like to thank you for this video. English is not my native language & I'm a little bit rusty for now, but your spelling is clearly comprehensible. This is great, thanks. Besides this, your advice is a pure jewel. Thank you.

@techwithbasil 2 жыл бұрын

Great explanation, precision and clarity on important git concepts. Thank you

@lsim001 2 жыл бұрын

Love this talk. Concise but clear explanations on some of the concepts that people misunderstand. Would love to see something similar about the basics e.g. how git work (local vs origin), how commits work etc.

@1willFALL 2 жыл бұрын

the intricacies on how commits are created via globs gets very fine detailed, I would recommend reading Pro Git, unless you find some KZfaq video that explains it, please do tell.

@sandrojorgeoliveira175 2 жыл бұрын

Hi Günther, thank you about this amazing training! The best for you!

@ahmadjamalmughal47 2 жыл бұрын

Man you were so clear and to the point. Thanks for the tutorial it was very informative man.

@DavidLindes 2 жыл бұрын

I'm glad you started with git add -p. I always teach that to folks when I can... it's so useful!

@rishabhjain911 2 жыл бұрын

I really appreciate this tutorial . It was worth it. Learned something new with excellent explanation

@Metal3z 2 жыл бұрын

amazing work. i finally understood the difference between pr and merge. thanks for the amazing explanation.

@romanmasiar122 Жыл бұрын

The way you explain things is simply....awesome. Thanks !!!

@veziop 2 жыл бұрын

this is outstanding quality. The pace and the tone might seem irrelevant but they really helps

@KevenWebb 2 жыл бұрын

This was very well done. I am sending it on to others. Best video for git at this level that I have seen.

@adityamishra7486 Жыл бұрын

Awesome tutorial. This man explained everything in a very Calm and awesome way. Loved It!!

@p-a5603 2 жыл бұрын

Very good tutorial! Even though I feel quite a familiar with git already, I have learned some new stuff again! :) Btw, very nice solution of solving merge conflicts in Tower! Thanks.

@GarimellaProduction 2 ай бұрын

working with git a lot these days and this is great. I have gotten more comfortable with rebase and merge requests

@joross8 2 жыл бұрын

Tobias you have a fantastic speaking voice and presentation style. Really enjoyed this practical no bs review of how to use Git effectively,

@TheDorac1 2 жыл бұрын

I was literally looking for these advanced concepts earlier this week! Thank you!

@fakedevdutt 7 ай бұрын

Its been more than 2 years of development i didn't know there was a -p option in add command it could have helped me soo much in past but I am sure it will help me more in future thanks man!!

@me.shailendra 2 жыл бұрын

Great Job! Now I am confident enough to manage any size code base. Thank You.

@johnbrain3971 2 жыл бұрын

Very good content, learned a lot through this course, Just a tiny little request: can you please share the slides? So I can make notes more easily.

@aghaaslam9575 Жыл бұрын

My Note: the arrow of every visualization means the old commit if exist Staging is important to differentiate some projects! 6:17 commit message should have subject and body. 8:30 conventional branches on team is important! IMPORTANT FOR ME: 24:33 Merge Conflict 27:55 undo a conflict and start over

@user-ho9kr6iw7y Жыл бұрын

Concise explanation, a lot of useful info jammed. Thank you for your excellent work.

@nibbanapatipada9538 2 жыл бұрын

Man! your voice is soo soothing, whenever I get started watching this video, I fall asleep in 5 minutes.

@rajat_singla 2 жыл бұрын

I wish I had such clarity of mind as the person explaining these concepts

@PerryvandenHondel 2 жыл бұрын

A small remark; please clarify. Seems to me that the arrows are placed in the opposite direction of the development flow. Should I read them as a change is pulled from a previous step? I presume the diagrams need to be read from from left to right but the arrows seem to point against this direction.

@Californ1a 2 жыл бұрын

The arrows point to the parent of the commit, whatever previous commit that one references since that's how git tracks history, using a reference to the previous commit. He's showing how git "looks back" through that history, and follows those references backward to find the common ancestor.

@adelimamovic2073 2 жыл бұрын

Are you referring to the red arrows e.g. at kzfaq.info/get/bejne/i9mqncKclaqro5s.html? Every commit is a knot in a directed acyclic graph and refers to a previous commit.

@jmemusic 2 жыл бұрын

@@Californ1a Thanks for clarifying this; it was somehow strange to see the newer commits at the right, but the arrows pointing to the opposite direction. Now it makes sense.

@congminhluu5068 Жыл бұрын

that's such a cool explanation of rebase. The visual helped a lot! Glad I stuck till the end

@DorianIten 12 күн бұрын

Very useful, thank you, Tobias!

@tiberio_ck 2 жыл бұрын

Thank you so much for this amazing course!

@MrMassaraksh Жыл бұрын

I like how you can link commit messages with the tasks, so you don’t need to make them meaningful after this, everything will be in task

@jiren8991 2 жыл бұрын

WOW! I was just looking for this. Thanks y'all

@davidclark1775 2 жыл бұрын

Good content. However, I think you missed one of the more common patterns involving rebase and merge. In your case of an LT branchA and work branchB with changes on both you rebased the changes in branchA on the changes in branchB. In my experience, it is more common to rebase the changes in branchB on the changes in branchA (checkout branchB, rebase branchA, , commit) then merge the resolved changes back into branchA (checkout branchA, merge branchB). That final merge MUST be a fast-forward. If it isn't, start over. This completely avoids the problem of rewriting history on branchA that you alluded to. Given branchA may be used as a base by other developers and could be hosted on a server that disallows history changes, that is essential.

@wiurxee1993 2 жыл бұрын

Also even if you like to rebase an already pushed branch, you could do it safetely using the "git push --force-with-lease" and the "git pull --rebase" options, that will avoid you overwritten any changes made in the remote branch.

@markcuello5 2 жыл бұрын

What`s a branch?

@markcuello5 2 жыл бұрын

@@wiurxee1993 What is `Re-base`?

@alokbaluni8760 Жыл бұрын

@@markcuello5 branch is pointer to the recent commit

@hamidr8391 Жыл бұрын

To update a branch we can pull master to that branch : Git checkout b1 Gut pull origin master

@abdullahadam7694 2 жыл бұрын

Great video! Something which can be useful for finding files with merge conflict markers: git diff -check

@itspersie 2 жыл бұрын

most valuable channel on yt for me rn ✨ thanks 🤧

@chiaramariadedominicis458 Жыл бұрын

Maybe the most useful (intermediate/advanced) video on git/Github I've seen so far

@savitapandey6604 2 жыл бұрын

This is the best channel i would suggest every one if they are beginners

@stephane184 2 жыл бұрын

I’ve been working with GIT for a few years but never got deeper than basic concepts. The patching was neat and will come in handy.

@markcuello5 2 жыл бұрын

What is `Patching`?

@ClaudioBOsorio Жыл бұрын

Man I love these videos. I wish I had the time to watch the whole channel and visit every contributor. Much love

@MrStarcraftangle Жыл бұрын

so SIMPLE explanation of REBASE. Thank you for that 🥰

@rpf23543 2 жыл бұрын

very great tutorial, solved many questions I had, which I never looked up in past...Thank you!

@voyageruk2002 2 жыл бұрын

What a beautifully crafted tutorial.

@betoharres 2 жыл бұрын

I didn't knew about rebase cons, thanks a lot for sharing this valuable info!

@dirudeen1421 8 күн бұрын

Thank you very much. This was super helpful.

@python-programming 2 жыл бұрын

Looking forward to this!

@zucc4764 2 жыл бұрын

One topic in and I knew this is premium stuff. Thank you for this!

@ChanonJ 8 ай бұрын

Great lesson for most of new dev guy who need to use GIT here. Highly recommended :)

6 ай бұрын

Sometimes it is useful to realize that commits do not carry changes (i.e. diffs), rather they contain snapshots of the whole repository (though unchanged files are reused from previous versions).

@srikrishnanunna1 2 жыл бұрын

This video is awesome. I derespected Merge vs Rebase ! Thanks again!

@hellocheng7071 2 жыл бұрын

The video is so clear and helpful , thank you!

@user-gv2cj5so6q Жыл бұрын

Great video, well explained!

@orlandoreyes884 2 жыл бұрын

Excellent!! this video has helped me to finally undestand git commands easy explained. Thanks.

@AshwinPrakashKadayil 18 күн бұрын

Awesome video. Please keep educating us. Thanks

@bharathkumar2007 2 жыл бұрын

Very well explained, short and sweet :)

@rungxanh2901 2 жыл бұрын

Thank you Tobias for the wonderful tutorial 💯

@malicianewowlala6655 Жыл бұрын

For sure the best video I watched on git! Thank you so much.

@hasan0770816268 2 жыл бұрын

notes to self: only combine changes of a single topic in the same commit, git add -p enables staging parts of the changes of a file (patch level), of course, the file must already be tracked (using git add). merge: combining two different branches, it creates a merge commit in the process. with merge the two branches keep there own history seperated: b1-------- c1---------c2-----------------cm b2 |----c1-----c2--- c3 -------| rebase: rebase will unite the two commit histories of both branches, do not use rebase changes pushed to remote repo, rebase diagram: before rebase: b1: c1-------------c3------------ b2 |-------c2-----------c4----- after rebase: c1-----c2-----c4-----c3* notice that c3 is at the end, rebase moves commits that happened on b1 after the common ancestor, this means that c3 has changed (different parent)

@kriteshag003 2 жыл бұрын

Gosh! I needed this. Thank you!

@Bellathor Жыл бұрын

Fantastic video, nice explanations. Thank you. :)

@chfmrf9605 Ай бұрын

great video, very clear and also with the right amount of valuable background information

@ajjo5513 2 жыл бұрын

Very informative video. Every thing was very well explained!

@iiaaannnn Жыл бұрын

Love this video especially the pace of the video so much!

@jorgewandersantanaurena422 2 жыл бұрын

Thanks. It is really helpful to know about git merge/rebase --abort to fast-undo last merge. And good to know about fast-forward, merge-commit & the one done by rebase (I don't know the name) I like the tip about commit-message-schema. And about branch-strategy, I would prefer short-live branches. I love Pull Requests, you can even undo the whole pull request if needed. Even if there are a lot of commits. You only have to revert the pull request. Thats great.

@TubularAnimator Жыл бұрын

I really enjoyed my experience watching this. Tobias teaches in a delightfully soothing way.

@philipoakley5498 2 жыл бұрын

Good. Could be useful to mention where the the merge-base (third source for the merge) comes from. Also, maybe worth mentioning on the branching strategies, how it interacts with the team's server fork strategy (or lack of, should it be continuous integrated/merged to the core server approach, e.g. why that rebase warning comment)

@ricardorosa5315 2 жыл бұрын

Real good instructor!! 5 Star* Thank you so much!

@RandomMusingsOfLowMelanin Жыл бұрын

Great video, However I see at time 34:44 (and many other times too), there are 2 arrows. One shows where branch is progressing. The other one points in other direction i.e. the directionwhere branch started(on c3 -> c2 -> c1). (the opposite arrow is orange in color) Why is one arrow opposite from other? Whats the purpose? Again thank you for the great content. Cleared up so many things for me

@oliversmith7097 Жыл бұрын

I got confused by this too, the arrows seem to go in the wrong direction?

@RandomMusingsOfLowMelanin Жыл бұрын

@@oliversmith7097 still waiting for an answer

@RandomMusingsOfLowMelanin Жыл бұрын

So I have learned a bit more about git, the arrows are a good tracking tool. So for example, say you make a commit, you can follow the arrows to see what past commits this new commit is built upon. Say you have a commit and you can trace all the arrows from that commit to any other commit, if you can cover all the paths following arrows, you can be sure that this new commit has all the previous commit history. The purpose of the arrow is to 1. Find parent commit 2. More generally follow commit path

@mebasoglu 2 жыл бұрын

This is video is awesome. Thank you for all the effort. I admire your work.

@MarkBrathwaite 2 жыл бұрын

Very helpful review of concepts - thank you.

@mahdiporkar236 Ай бұрын

Great video. Watched the whole thing and didn't even notice the time.

@marcellinwabo9859 2 жыл бұрын

Thanks a bunch for this great tutorial. I have just learned many new thing by watching.

@emmy_thoughts 2 жыл бұрын

Awesome video. Very impactful!

@flamingwoodz 2 жыл бұрын

You are a great teacher!

@USONOFAV 2 жыл бұрын

I worked on intellij and I love the merge tool it got. Exactly looked liked the one shown here. My work though still uses eclipse so I might use this git tower app.

@ModEmbedded 8 ай бұрын

Good info. Additionally, I recommend (for any git user) to get to know the "git switch" and "git restore" subcommands. They help to clarify some ambiguous uses of "git checkout" and "git reset". (I'm a git bash CLI user, and I can't remember the last time I've bothered with checkout. And believe me, I switch between branches and commits frequently.)

@gertfourie3283 8 күн бұрын

ez thanks mate! proper, could of just added a git pull request, review, issues, commit merge reviewed cycle. apart from that, spectacular and some funny bits inbetween. Keep it up and thanks! Sometimes when I look at my commit history I want to rebase the whole thing, cleaning out the closet, now its perfecty clear on your own branch and not merged/pushed, its fine so your team does not send you a commit with a swear word in it. :D