extremely straightforward and practical, much appreciated, and I'm sure my team will appreciate me not ruining the master and endless merge conflicts, memeing myself
A lot of tutorials on youtube regarding this but you my friend have made it simple and without the 'fluff' - straight to the point and with a simple practical example.
Well explained! I was struggling trying to understand how to do certain functionality prior to watching this and now my questions have been answered. Thank you!
one of the best shortest practical video explanation on github. I have seen many videos they are only theory and even some of them are not showing practical but u r video is just like begginer of the github can even understand it tq very much
Thank you so much for the video! This has helped me tremendoulsy at my first job! Also the book Code Complete that you suggested in the video description is a winner! A big big big reason why i was able to get past some of my tech interviews while applying to jobs. If you haven't read code complete i highly suggest checking it out. Link in bio!!
Thrilled to hear the video made a difference for you! "Code Complete" is indeed a gem. Always happy to share resources that can uplift the community. Keep pushing forward!
Great video! Super clear and to the point! A lot of other tutorials dont cover the team working workflow but this is gold! What about using more branches like release and hotfix? Are there good examples how to use those? Greetings from germany 🙂
I like how you get to the point with this video. Great examples showing a successful merge and resolving a conflict. When you are on a tix-5 branch, does that the tix-5 branch show up on your local file directory? I see you can confirm which branch you are on in the terminal, but I am curious if you can visualize it when you're working on local? thank you.
if you want to see local branches ' git branch ' and if you want to see the remote branches (those on your github) then do ' git branch -r ' let me know if that helps
Can someone help me understand, Why does it cause a merge conflict when the changes are made the second time? What was different from the first pull request that didn't cause conflicts? Thanks
it was because he made the change in the same line. git didnt know which one to chose so you have to do it manually. that happened when he chose to use the new change instead of the old one in master. Hope that helps! :)
Here's a scenario: Time 1: A created a feature branch based on master. Time 2: A worked on 1 commit on the feature branch. Time 3: There is a new commit (maybe a merge) in the master branch. Time 4: The next day, A wants to continue to work on the feature branch. Question: Should he do a git pull in the morning before doing his work? Also, after the pull, how should he incorporate the changes in master into his feature branch? Or should he? Lastly, if the changes in master totally removed some main functions where his feature branch is based on, what should he do? Thank you!!
Yes, when you come in, you should always do a pull into your feature branch, this will make it easier when merging back into main/master to clarify the direction of the merge should be from Master/main --> yourFeatureBranch one more question to help, the only way that they can delete something you are working on, is if you merge your branch into main, but once thats done, why are you continuing with the feature branch?
I was curious about the private repo, how I will add contributors, and how to put limited access, such as branches, so they could not push changes to the repo as origin main or master.?? Thank you very much!!!
you are right, and this is mroe a habit, nowadays git add defaults behind the scene to git add -A. here is what the official documentation says: ``` -A --all If no is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories). ```
Awesome Explanation. Very Straight forward. Can you clarify my doubt. I am new to git. In your video when you pushed new branch to remote. Branch created in Origin with All Files, in that Branch we see all files instead of just Committed files. You committed only one file right .. But we see 2 files in that newly created branch. In My Project I have 100's of files For every small change if i push that branch, All files will be pushed. Can i Create New Branch with Only Committed files ? Thank You
Hey Prakash, when you create a new branch, you are making a temporary copy, when making changes only those changes will be pushed, no need to be pushing 1000's of files. thats why git is so cool, because it only updates the files where changes have been made. I would probably check if your .git, is not outside of the original repo folder.
Awesome video, I had so much trouble resolving merge conflicts before. Is there a certain extension needed in VScode to get those accept changes options?
I see you delete the branch after fixing up the ticket on the local repo, but what about the repository on git-hub? Is that deleted when you do another 'push', or what?
Hello william, excellent video. It explains the practical part of git, and not the theory. A question please, if you are searching to do another video on git, can it be about fetch. The complete practical side of fetch vs the pull. Remember, we do not want a theoretical explanation, we need a practical logic from your experience. Thanks a lot
People like to see what branches they actually are working on, so instead of having a lot of dead branches, it cleans it up and is easier to see where you are or what you have outstanding
@@williamavasquez If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
Please, can anyone help When you clone repository - did you do it on the companies repository or we should fork, and clone from the copy of our account?
everything others don't necessarily need to run the project smoothly (vscode folder, node_modules) and sensitive information. If you use create-react-app, that will add all of those to gitignore.
@@akodev If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
Question abt creating the pull request at 5:28. Is the assumption here that all team members have access to this github account, hence can create the pull request from within the account UI?
extremely straightforward and practical, much appreciated, and I'm sure my team will appreciate me not ruining the master and endless merge conflicts, memeing myself
helped a lot!! :) Thank you!
kekW
Facing the same issues....Accidentally created the merge for master or pr for wrong branches i am messing it up
A lot of tutorials on youtube regarding this but you my friend have made it simple and without the 'fluff' - straight to the point and with a simple practical example.
Well explained! I was struggling trying to understand how to do certain functionality prior to watching this and now my questions have been answered. Thank you!
Anything I can do! This was something I struggled with early on as well. Let me know any topics you’d like to hear!
This was great in portraying the actual practicality of git/github. I needed this, thanks.
Thank you so much. You’ve answered all my questions on collaborations.
one of the best shortest practical video explanation on github. I have seen many videos they are only theory and even some of them are not showing practical but u r video is just like begginer of the github can even understand it tq very much
So helpful for us noobs man, thank you for making this
Thank you so much for this... I was confused watching a lot of other tutorials but this cleared my doubts
Thank you so much for the video! This has helped me tremendoulsy at my first job!
Also the book Code Complete that you suggested in the video description is a winner! A big big big reason why i was able to get past some of my tech interviews while applying to jobs. If you haven't read code complete i highly suggest checking it out. Link in bio!!
Thrilled to hear the video made a difference for you! "Code Complete" is indeed a gem. Always happy to share resources that can uplift the community. Keep pushing forward!
Thanks for this very helpful and practical tutorial. This is the video that I am looking for after learning the basic knowledge of Git.
This was a great video for me to document the git process for my team, thanks!
Thanks for this video, I learn a lot from this!
Of course! Let me know if there’s any other topics you’d want to hear!
Great video! Super clear and to the point! A lot of other tutorials dont cover the team working workflow but this is gold! What about using more branches like release and hotfix? Are there good examples how to use those? Greetings from germany 🙂
That's an awesome practical tutorial.. Thanks
Glad it was helpful!
Just what I needed, legend
same
nice video, what extension/module in iterm shows the branch like how you have it? I want to try it too :)
Here is a link that can help you set it up gist.github.com/kevin-smets/8568070
let me know how it goes
@@akodev thank you! That’s what I was looking for :)
Thank you so much. Very informative video.
Anything I can do to help! Please let me know if there are other topics you’d like to hear about!
Cant believ you only have 82 subs. Cheers!
I like how you get to the point with this video. Great examples showing a successful merge and resolving a conflict. When you are on a tix-5 branch, does that the tix-5 branch show up on your local file directory? I see you can confirm which branch you are on in the terminal, but I am curious if you can visualize it when you're working on local? thank you.
Use VS code ..to visualize on locally
if you want to see local branches ' git branch ' and if you want to see the remote branches (those on your github) then do ' git branch -r ' let me know if that helps
shoutout to all the oldschool coders that did not abandon SVN for git
Can someone help me understand, Why does it cause a merge conflict when the changes are made the second time? What was different from the first pull request that didn't cause conflicts? Thanks
it was because he made the change in the same line. git didnt know which one to chose so you have to do it manually. that happened when he chose to use the new change instead of the old one in master. Hope that helps! :)
Thank you for the nice explanation
Amazing...
Appreciate it! Anything I can do!
Nice video 😆 this will definitely come in handy
Here's a scenario:
Time 1: A created a feature branch based on master.
Time 2: A worked on 1 commit on the feature branch.
Time 3: There is a new commit (maybe a merge) in the master branch.
Time 4: The next day, A wants to continue to work on the feature branch.
Question:
Should he do a git pull in the morning before doing his work?
Also, after the pull, how should he incorporate the changes in master into his feature branch? Or should he?
Lastly, if the changes in master totally removed some main functions where his feature branch is based on, what should he do?
Thank you!!
Yes, when you come in, you should always do a pull into your feature branch, this will make it easier when merging back into main/master
to clarify the direction of the merge should be from Master/main --> yourFeatureBranch
one more question to help, the only way that they can delete something you are working on, is if you merge your branch into main, but once thats done, why are you continuing with the feature branch?
This is the best! Can you tell us more what happens if you find sth wrong after pushing to origin
Thanks a lot , u have saved a lot of hours for me
Thanks a lot. Very useful and straightforward 🙌🙌
You're welcome!
Great simple video, helped me a lot, thank you!
Extremely helpful! Thanks!
Glad it helped!
Loving it , Thanks man!
Glad to hear it!
Greattt Video was very helpful
Good video! Thanks for making it very simple
I was curious about the private repo, how I will add contributors, and how to put limited access, such as branches, so they could not push changes to the repo as origin main or master.?? Thank you very much!!!
ill make a video about this, probably a short. give me a week from the date of this comment
amazing! i was looking for this information and u made it! Thanks a lot
Glad it was helpful! let me know if you have any other things you looking for, always looking for ideas for content
helped much! Thank you!!
but shouldnt the pull origin master be before pushing the feature branch?
thank you for the video !! It was very useful for me!
Thank you very much!
Appreciate your work, well explained :)
what is the -A parameter used for? Looks like an "all" but git add already does that so it's why i'm asking.
you are right, and this is mroe a habit, nowadays git add defaults behind the scene to git add -A.
here is what the official documentation says:
```
-A
--all
If no is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories).
```
Great video! Really really helpful..🙌🙌🙌🙌
Awesome Explanation. Very Straight forward. Can you clarify my doubt. I am new to git. In your video when you pushed new branch to remote. Branch created in Origin with All Files, in that Branch we see all files instead of just Committed files. You committed only one file right .. But we see 2 files in that newly created branch.
In My Project I have 100's of files For every small change if i push that branch, All files will be pushed.
Can i Create New Branch with Only Committed files ?
Thank You
Hey Prakash, when you create a new branch, you are making a temporary copy, when making changes only those changes will be pushed, no need to be pushing 1000's of files. thats why git is so cool, because it only updates the files where changes have been made. I would probably check if your .git, is not outside of the original repo folder.
Awesome video, I had so much trouble resolving merge conflicts before. Is there a certain extension needed in VScode to get those accept changes options?
nope, it should just come up, you can always try to restart vscode if it doesnt pick it up.
excellent video!
Good explanation
I see you delete the branch after fixing up the ticket on the local repo, but what about the repository on git-hub? Is that deleted when you do another 'push', or what?
Unless you push the command ( git push origin --delete nameOfBranch) we have only deleted it locally.
thank you bro, very useful!
Thanks a lot. It really helped me
Constantly pull from master ? Or branch we create day by day?
Pull from master to keep your branch up to date
Great Video!
much appreciated brother
very good video
hey, how'd you get your terminal to look like that?
I have the cobalt theme, and im using iterm2 with oh-my-zsh.
Very helpful indeed
Thanks man, that's so usefull
Thanks a lot!
Hello william, excellent video. It explains the practical part of git, and not the theory.
A question please, if you are searching to do another video on git, can it be about fetch. The complete practical side of fetch vs the pull.
Remember, we do not want a theoretical explanation, we need a practical logic from your experience.
Thanks a lot
ua-cam.com/video/1qO9eZANVgQ/v-deo.html&ab_channel=AkoDev
We made this one :) let us know what you think
Question: what is the point of delete the older ticket branch if it doesnt remove the branch on github?
People like to see what branches they actually are working on, so instead of having a lot of dead branches, it cleans it up and is easier to see where you are or what you have outstanding
@@williamavasquez If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
outstanding video
Thank you so much 😀
Please, can anyone help
When you clone repository - did you do it on the companies repository or we should fork, and clone from the copy of our account?
sorry for the delayed response, but you dont need to fork it, you should be able to clone the repo locally.
thanks , this is helpful
why "pull origin master" when you are about to delete the branch?
this is so it does not cause merge conflicts with master
Does pushing local branch to github automatically creates pull request( merging the branch to master branch) ?
no it does not, on github it shows a suggestion, but its not automatic (can you make it automatic, we can make a video how to do that)
Question : Which files to never push to github .. for example the google-json file in mobile development?
Its going to depend on the language, but in JS I would avoid the node_module, .env file (passwords, keys etc) and if you on a mac the DS_Store.
everything others don't necessarily need to run the project smoothly (vscode folder, node_modules) and sensitive information. If you use create-react-app, that will add all of those to gitignore.
@@akodev where is the .env file?
You would have to create the .env file.
Also if you use a .gitignore file you can name the files/directory’s you don’t want to push to git
Thank u so much!
Wonderfull
Gracias!
Thank you.
Do you clean the tix branches from the server or do they need to stay there?\
it depends on the team, I like to clear it out of my local, some places purge branches every quarter. so its all about preference.
@@akodev If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
nice video man
Appreciate it
Should I use git add . or git add -A?
git add . is used by most of the people. But you can use any.
James is correct, some people prefer -A but either one works.
Thanks man
Question abt creating the pull request at 5:28. Is the assumption here that all team members have access to this github account, hence can create the pull request from within the account UI?
Anyone can make a pull request, as long they have read access (not private repo)
do you have video how to step this up?
Bob, setting what up? if you let me know we can make a video
@@akodev the entire workflow how stepup best practice for git fork pull merge for team type thing
Thanks.
HELP
Is there something I can do to help?
don't know git is so confusing for me
... wanna know a secret? (I dont know what im doing! no one know!!)
That’s ok. Take your time and practice. Best! 😁
I found gold