Git for Professionals Tutorial - Tools & Concepts for Mastering Version Control with Git
video description
Date: 2022-03-14
Related videos
Comments and reviews: 8
Hasan
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)
reply
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)
reply
Vladimir
start was interesting, but alot of -water- that not makes sense, can be converted from 40 min to 10-20min ! why show that you use a 100+ megabit connection and so on/...
Use -git mergetool- + meld and forget about git conflicts! however i still cant understand, why you are do not use -mate- IDE to solve conflit? or that IDE do not help? so why not start to use ATOM, its free and powerful as jetbains or web studio!
reply
start was interesting, but alot of -water- that not makes sense, can be converted from 40 min to 10-20min ! why show that you use a 100+ megabit connection and so on/...
Use -git mergetool- + meld and forget about git conflicts! however i still cant understand, why you are do not use -mate- IDE to solve conflit? or that IDE do not help? so why not start to use ATOM, its free and powerful as jetbains or web studio!
reply
Stephan
For me the most important thing that belongs in a commit message is: Why this change. This should go in the subject not the What, because the What can be seen easily by looking at the changes. I think commit-messages as annotations to the changed lines, not describing the history of the project. So I write the messages for -git blame- and not for -git log-
reply
For me the most important thing that belongs in a commit message is: Why this change. This should go in the subject not the What, because the What can be seen easily by looking at the changes. I think commit-messages as annotations to the changed lines, not describing the history of the project. So I write the messages for -git blame- and not for -git log-
reply
Perry
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.
reply
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.
reply
Sergey
Good tutorial. Regarding GitFlow I recently created an extension for VS Code serhioromano.gitflow that creates visual interface and helps manage a project with that branching model. There is much more to GitFlow, with support type branch that allows to have LTS versions, and tags management.
reply
Good tutorial. Regarding GitFlow I recently created an extension for VS Code serhioromano.gitflow that creates visual interface and helps manage a project with that branching model. There is much more to GitFlow, with support type branch that allows to have LTS versions, and tags management.
reply
Lim
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.
reply
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.
reply
Rohan
Can anyone please explain why the arrows after the branch labels are pointing forward, while those for the commit labels pointing backwards? What is the convention being followed? For Eg look -35:46
reply
Can anyone please explain why the arrows after the branch labels are pointing forward, while those for the commit labels pointing backwards? What is the convention being followed? For Eg look -35:46
reply
Paul
Very informative and comprehensive on the main topics we work with in Git. I just saved myself several google searches trying to understand the concepts. Thank you -freeCodeCamp!
reply
Very informative and comprehensive on the main topics we work with in Git. I just saved myself several google searches trying to understand the concepts. Thank you -freeCodeCamp!
reply
Add a review, comment
Other channel videos
