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?
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
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.
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?
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.
![KAYTRANADA - Witchy (feat. Childish Gambino) [Official Video]](http://i.ytimg.com/vi/jGK3YVmGZ3Y/mqdefault.jpg)
![BabyChiefDoit - Too Slow (feat. STAR BANDZ) [Official Music Video]](http://i.ytimg.com/vi/zayaxws7RPg/mqdefault.jpg)
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 ❤❤
Excellent explanation. I got all I needed and more. Ready for FORK now 🙂
I keep coming back to this video. This is a wonderful resource.
Thank you so much for this video. I'm new to using all this desktop git stuff and this was a major hurdle.
Your explanation is deeply in details... You are perfect
Thank you so much. This video really helped me
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 :)
Thank you - these videos are GREAT
very nicely explained ..please keep posted on some more videos on git or some other topics as well
Thanks Ma'am for clearing my concepts
Nice explanation
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.
Thank you!
You're welcome!
Very good explanation, thanks!
Excellent, thanks.
Thank you. Was looking for this exact issue for the longest time, and you demonstrated it so well.
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
I was wondering why it was so long until I figured out. I knew nothing. Great Video
Thank you!
Thanks a lot. well explained.
Exactly what I was looking for. Thank you so much, Gwen!
Thank you, mam...this is very helpful....
Great video!!🤩
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. Would love to see a version for how to do this in VS Code, with the visual interface.
Subscribed, liked, bookmarked too. Very informative video.
Straightforward and well explained content. Thank you for the tutorial!
How could you have two master. You did not show checking out upstream/master in the video. Did I miss something?
Thank you!
Excellent! Very common case scenario for someone entering an external project for the first time
Your freecodecamp video is really great. Thank you!
How to make sure your code doesn't get forked by staying behind master for too long 😛
What about rebase instead of merge?
Thanks
Does this command "git checkout -b newbranch remotebranch" i.e creating a local copy of an existing branch is that same as forking?
you r honest.
What about merge errors?
Advice: stick with the title of the video and avoid diversions ! End of the video got confusing !
Thank you very much...
Thank you.. helped a lot... 👍
Perfect explanation! Thank you!
Great video, if i have to pull tags from upstream how can i do it?
exactly what I was looking for amidst plenty articles showing examples only using 'main' or 'master'.
What is dev? I dont see anything in my machine, what is it stands for?
Is it better to rebase or merge the changes from the upstream?
Amazing..
That was very helpful, Thanks
Thank you for this video!!
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.
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
We want your hairs back.
Awesome! Thank you!
Must have never seen a real spoon ha
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.
In this we have to merge each branch seperately.....Is there a way to merege all branch of upstream to respective brances of origin
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?
good video about git
can you please put the commands whatever executed in this video in the description
Thank you!!!!
Thank you!
Thank you for this video! Exactly what I am looking for!
This video does not have enough likes!! Perfectly explained. Thank you for the content😁
Thank you so much..exactly what i was looking for..
can we use git pull instead of git merge to get the change from master to feature branch?
well, I tried many times until I could, it's a little bit hard
Thank you, very helpful and kept things simple
Perfect ,very good . Thank You so much !!!
Great teacher ! and great video....I went over a lot of git videos this is one of the best !
Hey it says upstream/dev -not something we can merge
You made it simple and precise..kudos
Thank you Gwen! Brilliant as always :)
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.
Thank you. Really useful and beautifully demonstrated
I saw you in freecode, your tutorials are really helpful
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?
Thanks a lot, much needed!!
thank you so much i was struggling just now lol until I found u
Great video! More clear now!
great. On-the-point content.
As always amazing video
Thank you !!!!!!!
I really needed this, thanks
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
what the fuk is dev