Open deepakarchinnova opened 6 years ago
Recording URL: https://vimeo.com/242530428/520f4a18ad
git pull = git fetch + git merge
.git fetch
git merge
will merge it to the local repository but only for the branch you are currently checked out to. "If you have any changes in your other branches, it will basically merge it onto yours" <- Not correct, this will only happen for the branch you're currently checked out to. :smile: (Later, I see Saeed helps clarify and you make sure to clear this up. Good job.)git branch --merged
Very good description.-d
option. If you need -D
, Git will post that into the terminal so you know that you need it. I don't think it has anything to do with the remote tracking branch. --prune
. Good description and clean example.git config --global fetch.prune true
) is recommended, but I don't set it as a trainer so I can demo the behavior with default configurations.git log
is.--global
--unset
for a configuration, like git config --global --unset alias.lol
--local
will be stored in the .gitconfig
file within the shared repository, not the .git
file.githubschool
repository from our group class. A fork changes the ownership and creates an exact copy, so you'd look under your own account. I missed both sections "Editing on GitHub" and "Merge Conflicts". I think you could do better here. Depending on the videos for the next few days, I may ask you to re-record those segments.
😄 Thanks for letting me know. Editing on GitHub I forgot this topic totally. I can revisit this for sure. Merge Conflicts we ran out of time as I believe I was eating into both of our working time. We are working on post work timings but materializing it is rather a difficult affair. If you have any suggestions for this I would love to hear it.
We are working on post work timings but materializing it is rather a difficult affair. If you have any suggestions for this I would love to hear it.
I'm not sure what you mean. Can you please clarify?
Sure. Our group tried to run the teachback in the morning but is not working well as expected. So we switched the time to the evening i.e. after work timing, which is also not working super well as one would be free but the other would not. Mostly it is coordination and unavailability but everyone is super cooperative. We are working on it, but I thought I would mention it to you. I think the only solution is to be patient and await. Hope it is clear now. 😄
Ah, I see @deepakarchinnova. I'm sorry to hear that scheduling is challenging. Unfortunately I don't have any recommendations specifically, but I will say that if it becomes too burdensome to find shared availability, you can feel free to join the room and share your screen as if you were teaching. It will still record with 1 person, and though you won't have an audience, I will still review your videos. Good luck! I'm really enjoying your videos so far!
git bisect
is workinggit status
, you are still not finished with the bisect until you type git bisect reset
-b
flag means, even though it's not the first time you've used it. Sometimes people take this for granted and don't give the explanation, but I'm very glad you do!add -p
and mv
.git diff
while I am in the middle of git add -p
, because there is a lot to compare.git diff
.👋 @brianamarie thank you for the precise feedback. Appreciate it alot and you are doing an amazing job, otherwise I wouldn't recognize my mistakes/imperfections. Can you please acknowledge if you have received day-4 as my mac hung up on me and had to restart. For day-4 I think you might have 2 recordings. This is so I can plan ahead for the next steps.
Hi @deepakarchinnova! Yes, I have received all of the recordings. I'm watching the first part of day 4 right now. So far, they're all good. I think the one thing you have left is the post-test. 👍
git commit --amend
can dogit status
very frequently to show how exactly each command affects the working directory and staging areagit reset
git reset
. However, even though you did not use it, I thought you did a very nice job.git reset
would be usedgit reset
is dangerous, and is safe to use only locallygit cherry-pick
is another one example where using the visualization tool can be quite helpfulgit cherry-pick
git reset
going forwardgit rebase
git rebase
and git rebase -i
. I think going through with participants will be helpful, and actually make it easier, because their questions will help guide you in terms of how much time to spend on each part of the concept. Congratulations, @deepakarchinnova! I think you've done a fantastic job. As soon as you complete the post-test, I will invite you to our Slack room and send you the training manual. I've very much enjoyed watching your videos, and I appreciate all of the time and effort you've put into making them so fantastic. GitHub is lucky to have you as a partner!
👋 @brianamarie , I was able to complete the post test, but I have some queries:
The 'add -p' did not work the way it did for the class repository. May be we can have a session for this via https://github.youcanbook.me/index.jsp
You're right - you are not the first one to bring this up. Do you know why it doesn't work? 😉 Git's similarity index looks at the whole file, and since the file is small, the "blobs" aren't considered far enough apart to be different changes. 👍 That's really all there is to it. 😄
Recording
Topic: Introduction to GitHub, Getting Ready for Class, & Getting Started
git clone
,git fetch
,git pull
, andgit push
.git --version
, and advising to have version 2+. At this point, it might be a good idea to pressCmd
++
to make the window and the text larger and more legible.Topic: GitHub Flow
git hist
- what is this command? It worked for you, so maybe is it an alias?Topic: Working Locally
Topic: Collaborating on Code
In general, very nice job. To continue improving, I recommend focusing on: 1) making it clear when participants should follow along
2) being cognizant of timing and pacing