This is so helpful that you made my day. I wish I could have someone like you near me all the time ... Please always keep us in touch with us via this channel ❤❤
Thank you for for th video! I also loved your freecodecamp video! Quick question: Once I fork a project to work on it, should I create a branch for it or work in the main/master branch of the fork?
Is there a way to merge commits from the upstream repo which doesn't result in pushing the forked repos commits ahead of the original? i.e. After merging can we have the forked repo 'even' with the original? Or does it really not matter?
What if I want to fork a project for the sake of making edits to have a variant of the project. I want to remain synced with the main project but maintain my edits.
error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. I get this error after git merge upstream/master
You set up your fork (and sync your fork as in this video), then create a branch with changes (commits). After pushing to origin (your fork), view it in github (your fork) and you'll see the option to create a "pull request". The changes remain in your fork, but the pull request is a thing which shows up on the github displays of the upstream repo, where project maintainers can discuss it with you and decide whether to merge it, or they might ask you to change it. The code commits are still in your fork, so you're in control of the process of tweaking it and getting it in shape ready to merge.
Pull just fetches and merges. I usually pull when I'm working with one repo and fetch when I need to update a forked repo. That way I can fetch changes and see the diff before I merge.
I keep coming back to this video. This is a wonderful resource.
Your explanation is deeply in details... You are perfect
Excellent! Very common case scenario for someone entering an external project for the first time
exactly what I was looking for amidst plenty articles showing examples only using 'main' or 'master'.
I was wondering why it was so long until I figured out. I knew nothing. Great Video
Thank you. Was looking for this exact issue for the longest time, and you demonstrated it so well.
Very comprehensive and solid. Subscribed. Thank you.
Thanks for this video, Gwen. This is really helping me come up to speed with Git and GitHub usage.
This is so helpful that you made my day. I wish I could have someone like you near me all the time ...
Please always keep us in touch with us via this channel ❤❤
Thanks a lot. This video was really helpful!
i just had one branch -> master. So i ran the command:
git merge upstream/master origin/master
Straightforward and well explained content. Thank you for the tutorial!
Thank you so much for this video. I'm new to using all this desktop git stuff and this was a major hurdle.
Exactly what I was looking for. Thank you so much, Gwen!
This video does not have enough likes!! Perfectly explained. Thank you for the content😁
Excellent explanation. I got all I needed and more. Ready for FORK now 🙂
Thanks a lot. I was searching for this from a very long time. Thank you.
Thanks a lot for this Gwen...Was looking for exactly this..Great video :)
very nicely explained ..please keep posted on some more videos on git or some other topics as well
Your freecodecamp video is really great. Thank you!
Subscribed, liked, bookmarked too. Very informative video.
You made it simple and precise..kudos
Thank you for this video! Exactly what I am looking for!
I saw you in freecode, your tutorials are really helpful
Thank you Gwen! Brilliant as always :)
Great teacher ! and great video....I went over a lot of git videos this is one of the best !
Thanks. Would love to see a version for how to do this in VS Code, with the visual interface.
Perfect explanation! Thank you!
This video was really helpful to me. It makes me want to take your git course but can't find it on your website. Do you have a link?
Thanks Ma'am for clearing my concepts
Thank you. Really useful and beautifully demonstrated
Thank you for for th video! I also loved your freecodecamp video!
Quick question: Once I fork a project to work on it, should I create a branch for it or work in the main/master branch of the fork?
In ideal case, you create a branch, make changes then merge and commit to main branch.
Great video, if i have to pull tags from upstream how can i do it?
Thank you so much. This video really helped me
Thank you, very helpful and kept things simple
Thank you - these videos are GREAT
How could you have two master. You did not show checking out upstream/master in the video. Did I miss something?
Thank you so much..exactly what i was looking for..
Thank you.. helped a lot... 👍
thank you so much i was struggling just now lol until I found u
great. On-the-point content.
Thank you for this video!!
Very good explanation, thanks!
Perfect ,very good . Thank You so much !!!
Does this command "git checkout -b newbranch remotebranch" i.e creating a local copy of an existing branch is that same as forking?
Thanks a lot, much needed!!
I really needed this, thanks
Great video! More clear now!
That was very helpful, Thanks
Is it better to rebase or merge the changes from the upstream?
Is there a way to merge commits from the upstream repo which doesn't result in pushing the forked repos commits ahead of the original? i.e. After merging can we have the forked repo 'even' with the original? Or does it really not matter?
What if I want to fork a project for the sake of making edits to have a variant of the project. I want to remain synced with the main project but maintain my edits.
As always amazing video
Awesome! Thank you!
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
I get this error after git merge upstream/master
In this we have to merge each branch seperately.....Is there a way to merege all branch of upstream to respective brances of origin
Nice explanation
can we use git pull instead of git merge to get the change from master to feature branch?
Thanks a lot. well explained.
can you please put the commands whatever executed in this video in the description
Excellent, thanks.
Thank you, mam...this is very helpful....
Great video!!🤩
What about rebase instead of merge?
you r honest.
Hi, could you made a video about creating ssh keygen and add it to git hub? Thank you!
I include that in my Git video on freeCodeCamp. Did you see it there?
Thank you!
What is dev? I dont see anything in my machine, what is it stands for?
Hey it says upstream/dev -not something we can merge
How do you contribute to another project without necessarily having access to the repo?
You set up your fork (and sync your fork as in this video), then create a branch with changes (commits). After pushing to origin (your fork), view it in github (your fork) and you'll see the option to create a "pull request". The changes remain in your fork, but the pull request is a thing which shows up on the github displays of the upstream repo, where project maintainers can discuss it with you and decide whether to merge it, or they might ask you to change it. The code commits are still in your fork, so you're in control of the process of tweaking it and getting it in shape ready to merge.
Thanks
Thank you very much...
good video about git
What about merge errors?
Thank you !!!!!!!
How to make sure your code doesn't get forked by staying behind master for too long 😛
Amazing..
well, I tried many times until I could, it's a little bit hard
After git fetch upstream master, why don't you just do " git pull upstream master" instead?
Pull just fetches and merges. I usually pull when I'm working with one repo and fetch when I need to update a forked repo. That way I can fetch changes and see the diff before I merge.
@@FaradayAcademy makes sense. Thx
Advice: stick with the title of the video and avoid diversions ! End of the video got confusing !
We want your hairs back.
Must have never seen a real spoon ha
what the fuk is dev
Thank you!
Thank you!!!!
Thank you!
Thank you!
You're welcome!