Great video. Forgot to mention git switch or git tag. Also git rebase can be used for a whole lot more but I guess not when working on a public repo. Overall great video. Thanks. 👍
Merge, by preserving the commits, also preserves the conversations and annotations in a PR, which may be important during the lifetime of a PR. Your collaborators will be able to see what you have solved between commits in response to their comments. Unfortunately git rebase does not provide it. But at the end of a feature branch work and solving all comments, it might be actually beneficial to rebase the branch, as the merge commit might become a large one over time. When working on a shared branch, one might also want to use git pull --rebase, a very useful command
I have encountered a situation where I was working on a feature branch locally. When I checked out to the main branch and ran 'git status', it showed changes from my feature branch. I tried to do 'git pull' on main but it failed because there were uncommitted changes. Somehow the changes I made in my feature branch also existed in main. How can I resolve this situation where changes from my feature branch are appearing in main after checking out, even though I haven't merged the branches? Additionally, I've also faced a situation where running 'git status' shows the same file appearing as both staged and unstaged changes. There were 60+ files that were identical in both staged and unstaged sections. I'm unsure how to determine if the staged version is updated compared to the unstaged one, especially if an automated tool staged the changes as I worked. How should I approach understanding which version of those duplicate files is correct in cases where 'git status' shows the same file as both staged and unstaged with many duplicates?
Your videos are always on time :')
I needed to get good grip of Git and Github :)
Thanks a lot Tim
Worth noting that the "new" (been a while acutally) to switch (and maybe create) branches is to use `git swich`
Please help me how to run the program in python text
Great video. Forgot to mention git switch or git tag. Also git rebase can be used for a whole lot more but I guess not when working on a public repo. Overall great video. Thanks. 👍
Great job on your videos.
This is video I have looking for!!! Thanks Tim🙏🙏🙏
Well explained , thank you bro !
Well explained video
Could you cover fast forward vs no fast forward as well and how it relates to merge and main?
Thanks - really useful video. 👌
very nice and easy to understand
Thanks
Merge, by preserving the commits, also preserves the conversations and annotations in a PR, which may be important during the lifetime of a PR. Your collaborators will be able to see what you have solved between commits in response to their comments. Unfortunately git rebase does not provide it. But at the end of a feature branch work and solving all comments, it might be actually beneficial to rebase the branch, as the merge commit might become a large one over time.
When working on a shared branch, one might also want to use git pull --rebase, a very useful command
Thanks, Tim.
Use this button to like for more intermediate content🤝
Would like a Video like this about ci/cd in github action
I have encountered a situation where I was working on a feature branch locally. When I checked out to the main branch and ran 'git status', it showed changes from my feature branch. I tried to do 'git pull' on main but it failed because there were uncommitted changes. Somehow the changes I made in my feature branch also existed in main.
How can I resolve this situation where changes from my feature branch are appearing in main after checking out, even though I haven't merged the branches?
Additionally, I've also faced a situation where running 'git status' shows the same file appearing as both staged and unstaged changes. There were 60+ files that were identical in both staged and unstaged sections. I'm unsure how to determine if the staged version is updated compared to the unstaged one, especially if an automated tool staged the changes as I worked.
How should I approach understanding which version of those duplicate files is correct in cases where 'git status' shows the same file as both staged and unstaged with many duplicates?
Best timing as if you knew it 🙂
Bam!
Hey Tim please do more videos on computer vision
Any Comments on gpt 4 and chatgpt plugins?
Nice
Why do you code on Windows?
WSL is stronk
Can I get beginner video link from anyone on this channel
just search from the pleylist of this channel
@@mirshodoripov1035 ok
First comment🎉
First commit🎉
@@Boss-ks8vt That's a good one! 😂
please someone stop the background music
Bring back tim without beard😢
Thanks