Depends on personal preference. For me this guy is too animated and distracts from the content. Prefer people who are concise and get to the point faster
I now understand why you have all those subscribers. I was having issues merging two different branches That's one of the best ways to teach Thank you so much
wow, I have never watch tutorial so interactive and much fun like this in other tutorials, I was able to correct the conflict once with no issues, Thanks.
Thank you. Been to lazy to figure out merge conflicts, so seeing this video really helped, especially since I am working on some pretty big projects at the moment.
So how does it know when files are conflicted? what i mean is this: if let's say someone changes line 5 in a file and pushes it. Then someone elkse pushes a change in line 5 too about 5 minutes later.. Why does it not just overwrite it like it would have in a normal situation? does github keep track of what file versions are where at any given time? Like: Person A pulls file X from master. Person B pulls file X from master aswell. then person A changes line 5 and pushes it (nothing happens and everything is fine) Github sees that there is an update to file X so it changes the files version. then person B pushes his changes on line 5 and there is a conflict because this person still has the older version of file X. This woudnt have been a problem if he changed other lines than line 5(which weren't changed in all the file X versions since his last pull). Than someone must decide what change to go with and mark as resolved. So to summerize: Github keeps track of versions in the background, everytime someone makes a commit the version number changes (calling it version number for simplicity sake) if you are working on a older file version than in the master you can only upload changes to lines were no change has been made in updates between your version number and the most recent one on the master. If you do it gets conflicted and needs to be resolved. i am trying to understand and im just explaining how i see it now,. Please correct me if im wrong. Thank you :)
I loved this tutorial series and the way you explain the things! You make everything seem so fun. Also, could you please add a video on resolving the merge conflicts using the command line?
At the start of video (first time seeing this gentleman) I though he will be too over the top, affected and annoying with his gesticulation and articulation, but honestly It it is great presentation style and it kept me engaged! Many should learn, as I zone-out with most of presenters nowadays. Good luck.
I so appreciate these training video. U are a great trainer! These clips are going to help lots of people. ... me included. In particular, although I already know github, I don't need to do much conflict resolution! When I need it in a blue-moon night, I often find myself forgetting the detail steps. And this video is very very helpful to get my operational confidence back! Thanks thanks thanks!
oh my GOD dude you are a lifesaver. whenever i had a conflict i would always download my code and resolve that shit somewhere else. I did not know i could edit the code on the website itself >_> PS: Also i somehow forgot this channel existed :D, last time i was here i needed to know something about regexp
So do conflicts only occur when you merge more than 1 file to your master. if you always merge one file at a time will it just continuously overwrite the previous lines with the new lines.
It depends on when both people "received" their files. If two people edit a file at the same time and both publish their changes there can be merge conflicts. But if they work on the file one after another, meaning one person changes something and publishes that change, the other person then takes that changed file and edits that there shouldn't be any merge conflicts. Any time you check out the data from a git repository your files get a version number (somewhere hidden in the depths of git). And this version number determines how files are merged. If the file you're editing is at version v1000 and you commit your changes, your file will be compared with the most recent file in the repository. If the most recent file is still v1000 then that means you have the newest version and your changes are accepted without problems. This now changes the version in the repository to v1001. But if two people check out the same file at the same time they both get a file with version v1000. The first person to commit a change now gets a free pass and increases the version in the repository to v1001. The second person to commit now has a file with version v1000 that is in theory OLDER than the file in the repository which now has version v1001. This is where merge conflicts can happen. If the second person edited the file in regions where the no change happened (from v1000 to v1001) then the change is usually accepted. But if the second person changed some lines that were also changed going from v1000 to v1001 then you get a merge conflict and need to decide which change you want to use.
6:55-7:25 "Well, just a second there, professor... We fixed the glitch. So he won't be receiving a paycheck anymore. So it will just work itself out naturally..." / "Problem is solved from your end!" -The Bobs
The Code for your Perlin Noise Terrain is giving fill effect in the JS rather than the node(particle effect). please look in to it as i am not able to get a hang of it. It maybe because of:- fill(200,200,200, 50); Also can you let me know How to link 'processing' with html file. I AM USING BRACKETS.
Is there a case where the automatic commit message won't have "into " at the end? In an online course the automatic message is just "Merge branch ''". But when I followed along I got "Merge branch '' into " just like in your video on GitHub. Could this be from them having an older version? I'm just using Git 2.28.0.windows.1 through MINGW64 (command line). The course could be using an older version of Git, around 2.20 and on Ubuntu. I already noted some differences, e.g. "git checkout " works the same way as "git restore ", same for "git reset " vs "git restore --staged ". (If you have any experience with using Git from the command line)
I'm having a issues with Cloning my GitHub repo, can't push anything. Err is: Fatal: unable to access 'githublink': Failed to connect to 127.0... port 1080: connection failed How can I solve it, please help me. Thanks.
Thank you very much for the video. I have a question on 7:31 after you clicked commit merge button. Did it affect your master? for this commit, is it just commiting and pushing a fix onto your own branch - map-improvement ? I can't test it on my own, I'm afraid I would ruin my company's work here.
After resolving merge conflicts, both base and compare (feature) branch are automatically updated. Why? I mean after resolving merge conflicts the head will updated. For me feature branch also updated with respect to the base branch.
But... Okay, to continue your example, let's say that a pull req has changes to lines 2, 3, and 4. But, meanwhile, you've also gone and changed lines 4, 5, and 6 in your master. So a conflict occurs on line 4. You resolve it in favour of the master, ignoring the change to line 4 from the pull req. Isn't it possible that doing so will break some piece of functionality or some dependency in the pull req?
Question: I am using github desktop tool and it does not have a feature for merging the pull request. The only option is to use the github online interface which seems clumsy. Does anyone know about a desktop tool where I could see the conflicts side by side and select which one to include?
That was amazing. SUBSCRIBED :D I have a question. I have a repo on my account and my friend just forked the repo and made some changes. He actually made some great changes. Removed some files and created some new files and so on. He made a pull request to my repo and what I see in the pull request description is that almost all files are in conflict and the "Resolve Conflicts" button is disabled. It also tells me "Use the command line to resolve conflict before continuing". Any idea?
Wow this was such a great explanation thank you! What do you do when the merge does not say resolve conflicts and the PR does not actually merge changes?
I was trying to push to github repository but due to large file lfs error come. So I delete the larg file which is not necessary due to which error was coming but still error is there of git LFS. Any suggestions about this problem how to solve it
I never understand the merge option. What if somebody decides to delete some important data structures at the top of the file and another person decides to use that data structure in a function at the bottom of the file? Looks like there's no conflict, but the program just got broken. I consider mergers done automagically to be a dangerous loop hole.
That is what continuous integration is for. Any time you make a change the "merger" automatically runs a bunch of tests you have written. Only if all tests are working will the change be accepted.
I work on elastix server which based on centos when I install an file this error appeared ( file /var/www/html/help/content from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch file /var/www/html/images/help/extras from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch )
All teachers the world over take note! This is the CORRECT way to teach a subject. Thank you!!!!
Depends on personal preference.
For me this guy is too animated and distracts from the content.
Prefer people who are concise and get to the point faster
The energy level is just perfect to keep my attention on the videos
I now understand why you have all those subscribers.
I was having issues merging two different branches
That's one of the best ways to teach
Thank you so much
My heart stops everytime I merge something, worried I've messed up the whole project lol
Same situation
How's it now?
wow, I have never watch tutorial so interactive and much fun like this in other tutorials, I was able to correct the conflict once with no issues, Thanks.
Excuse my obvious britishness here but:
MATE! YOU ARE A FUCKING LEGEND!!
I needed this today sooo baldly!
Old comment, but made my day today 🤣
Thank you. Been to lazy to figure out merge conflicts, so seeing this video really helped, especially since I am working on some pretty big projects at the moment.
Omg, Your way of teaching is so positive, fun, clear, and unique!!! I love it!!!! Thank you so much.
This is the kind of stuff that makes the internet worth. THANK YOU!
Thank you, man, as always you make it look more interesting than an action movie
Best ever video I watched on TH-cam which covers Git
From 5:18 to 5:28, I don't understand how the contributors could fix a merge conflict. Can someone explain it to me?
I really appreciate your teaching skills. Full package of knowledge, creativity, honesty and fun. Also, liked that ting ting ting thing at the last :D
Thank you so much! I was super overwhelmed when I was trying to figure out how to fix merge conflicts. You saved the day!
So how does it know when files are conflicted? what i mean is this: if let's say someone changes line 5 in a file and pushes it. Then someone elkse pushes a change in line 5 too about 5 minutes later.. Why does it not just overwrite it like it would have in a normal situation? does github keep track of what file versions are where at any given time? Like:
Person A pulls file X from master.
Person B pulls file X from master aswell.
then person A changes line 5 and pushes it (nothing happens and everything is fine)
Github sees that there is an update to file X so it changes the files version.
then person B pushes his changes on line 5 and there is a conflict because this person still has the older version of file X. This woudnt have been a problem if he changed other lines than line 5(which weren't changed in all the file X versions since his last pull).
Than someone must decide what change to go with and mark as resolved.
So to summerize:
Github keeps track of versions in the background, everytime someone makes a commit the version number changes (calling it version number for simplicity sake)
if you are working on a older file version than in the master you can only upload changes to lines were no change has been made in updates between your version number and the most recent one on the master.
If you do it gets conflicted and needs to be resolved.
i am trying to understand and im just explaining how i see it now,. Please correct me if im wrong.
Thank you :)
I loved this tutorial series and the way you explain the things! You make everything seem so fun.
Also, could you please add a video on resolving the merge conflicts using the command line?
At the start of video (first time seeing this gentleman) I though he will be too over the top, affected and annoying with his gesticulation and articulation, but honestly It it is great presentation style and it kept me engaged! Many should learn, as I zone-out with most of presenters nowadays. Good luck.
I totally panicked and then I came across this tutorial. Thank you so much for your wonderful tutorials
"when I see a green button it just makes me want to click it...click!"
absolute gold and hilarious
Your mannerisms are always lovely to watch :) Thanks for the informative video!
You're my favourite youtuber teacher now! haha
I so appreciate these training video. U are a great trainer! These clips are going to help lots of people. ... me included.
In particular, although I already know github, I don't need to do much conflict resolution! When I need it in a blue-moon night, I often find myself forgetting the detail steps. And this video is very very helpful to get my operational confidence back!
Thanks thanks thanks!
Most timely video I have encountered in a long time. Thanks a lot :D
This was super helpful! Thank you very much! I managed to get my conflict solved in just 5 minutes.
Loved the vibe of the video. Thanks for making it so clear and fun.
I died laughing at 4:01. What a great teacher wow!
Thank you so much! Seems simple but was taking me ages trying to figure this out and needed someone to explain clearly!
I'd love to see how this is done in the command line. Great video! :)
git checkout master
git merge other-branch # merges 'other-branch' into 'master'
git status # to see unmerged files
# remove conflicts in files
git add paths/to/modified/files
git commit
oh my GOD dude you are a lifesaver. whenever i had a conflict i would always download my code and resolve that shit somewhere else.
I did not know i could edit the code on the website itself >_>
PS: Also i somehow forgot this channel existed :D, last time i was here i needed to know something about regexp
It kind of feels like magic when you move from whiteboard to computer. Maybe you should make a video on your studio setup.
he already did
I admire how happy he is, I just want to end my life when I see a conflict.
Super demonstration... I became a fan of yours 😊😊😊
I appreciate you learning lots from you, your style of teaching is awesome. Thanks
Great to learn with you. It's fun. Courage.
That was way too helping and interesting, kudos to you for making it so fun to learn this !!
Dude, this is one of the best explanations!!!))
YES!! More git videos please
I found this to be informative. It is not something I am very familiar with. However I recently started coding classes.
where were you all this time >>> tutorial amazing stuff here
Thanks!!! You have saved my evening)))!!
So do conflicts only occur when you merge more than 1 file to your master. if you always merge one file at a time will it just continuously overwrite the previous lines with the new lines.
It depends on when both people "received" their files. If two people edit a file at the same time and both publish their changes there can be merge conflicts. But if they work on the file one after another, meaning one person changes something and publishes that change, the other person then takes that changed file and edits that there shouldn't be any merge conflicts.
Any time you check out the data from a git repository your files get a version number (somewhere hidden in the depths of git). And this version number determines how files are merged. If the file you're editing is at version v1000 and you commit your changes, your file will be compared with the most recent file in the repository. If the most recent file is still v1000 then that means you have the newest version and your changes are accepted without problems. This now changes the version in the repository to v1001.
But if two people check out the same file at the same time they both get a file with version v1000. The first person to commit a change now gets a free pass and increases the version in the repository to v1001. The second person to commit now has a file with version v1000 that is in theory OLDER than the file in the repository which now has version v1001. This is where merge conflicts can happen. If the second person edited the file in regions where the no change happened (from v1000 to v1001) then the change is usually accepted. But if the second person changed some lines that were also changed going from v1000 to v1001 then you get a merge conflict and need to decide which change you want to use.
Wow such a fun way to learn about conflicts 😄
Love the way you explain
awesome teacher. makes things look easy, enjoyable and conceptual. good job
Great lesson. Wish I had your energy.
+1 for the humorous walkthrough
this was great. beautifully executed
Thanks you I was afraid to click the green button, thinking it would merge my branch into master
You know right, you are one of the best!?
how does one fix merge conflicts using gitlab which doesn't have the `Resolve Conflicts` feature
this guy it's funny, why i never see this guy before?
your videos are really helpful and easy to understand.
thanks!
What if it's the same branch. Like I'm trying to pull from my master branch, but it's telling me to resolve the conflict first.
You made my day!!!! Awesome video sir.
Awesome video, educational and entertaining! 👍
6:55-7:25 "Well, just a second there, professor... We fixed the glitch. So he won't be receiving a paycheck anymore. So it will just work itself out naturally..." / "Problem is solved from your end!" -The Bobs
The Code for your Perlin Noise Terrain is giving fill effect in the JS rather than the node(particle effect).
please look in to it as i am not able to get a hang of it.
It maybe because of:-
fill(200,200,200, 50);
Also can you let me know How to link 'processing' with html file.
I AM USING BRACKETS.
Is there a case where the automatic commit message won't have "into " at the end? In an online course the automatic message is just "Merge branch ''". But when I followed along I got "Merge branch '' into " just like in your video on GitHub. Could this be from them having an older version? I'm just using Git 2.28.0.windows.1 through MINGW64 (command line). The course could be using an older version of Git, around 2.20 and on Ubuntu. I already noted some differences, e.g. "git checkout " works the same way as "git restore ", same for "git reset " vs "git restore --staged ".
(If you have any experience with using Git from the command line)
Very nice video. Nice explanation. This is gold. I suscribe!!
I'm having a issues with Cloning my GitHub repo, can't push anything. Err is: Fatal: unable to access 'githublink': Failed to connect to 127.0... port 1080: connection failed
How can I solve it, please help me. Thanks.
Thank you very much for the video. I have a question on 7:31 after you clicked commit merge button. Did it affect your master? for this commit, is it just commiting and pushing a fix onto your own branch - map-improvement ? I can't test it on my own, I'm afraid I would ruin my company's work here.
I get the "Reverting is not possible because you have umerged files" error but there is no button "Resolve conflicts".
After resolving merge conflicts, both base and compare (feature) branch are automatically updated. Why? I mean after resolving merge conflicts the head will updated. For me feature branch also updated with respect to the base branch.
You are insane, you are the best. The G.O.A.T. !
But... Okay, to continue your example, let's say that a pull req has changes to lines 2, 3, and 4. But, meanwhile, you've also gone and changed lines 4, 5, and 6 in your master. So a conflict occurs on line 4. You resolve it in favour of the master, ignoring the change to line 4 from the pull req.
Isn't it possible that doing so will break some piece of functionality or some dependency in the pull req?
Great job. Thank you!
Question: I am using github desktop tool and it does not have a feature for merging the pull request. The only option is to use the github online interface which seems clumsy. Does anyone know about a desktop tool where I could see the conflicts side by side and select which one to include?
Word Documents can be merged in Github If there is Conflict?
How many types we can resolve the merge conflicts?
That was amazing. SUBSCRIBED :D
I have a question. I have a repo on my account and my friend just forked the repo and made some changes. He actually made some great changes. Removed some files and created some new files and so on. He made a pull request to my repo and what I see in the pull request description is that almost all files are in conflict and the "Resolve Conflicts" button is disabled. It also tells me "Use the command line to resolve conflict before continuing". Any idea?
You are a great teacher👌
Nice video. V helpful for beginners like me. I did all using command line after watching this GUI mode :)
Is it the push request in the first place?
great explanation with example, thanks ;)
What if we need both the changes of different branch
Is there better explain about github on internet? I don't think so=) keep making your video, it's insane)))
Wow this was such a great explanation thank you! What do you do when the merge does not say resolve conflicts and the PR does not actually merge changes?
Can you create a gui to play chess?
Woofibs because i think it would be cool
Woofibs it's his cs1 project duh
Thank you so much, you're the best ❤❤❤❤
Thank you! lol Instead nuking branches I can actually do it the right way lol
Absolutely loved it😍😍
I was trying to push to github repository but due to large file lfs error come. So I delete the larg file which is not necessary due to which error was coming but still error is there of git LFS. Any suggestions about this problem how to solve it
Oh this is tricky! Try the help forums on our discord: thecodingtrain.com/discord
Thank you sir! Exactly was I was looking for.
Resolved conflicts button disabled? How to proceed?
Thanks!
Could you make an "introduction" in node JS or Electron?
Love your stuff
Check out this for node: shiffman.net/a2z/server-node/
thanks ♥
what to do if the conflicts are too complex?
hi sir, i am IT professional want to switch my technology to Devops , please guide how to start in Github
Thank you for awesome content on git.
I never understand the merge option. What if somebody decides to delete some important data structures at the top of the file and another person decides to use that data structure in a function at the bottom of the file? Looks like there's no conflict, but the program just got broken.
I consider mergers done automagically to be a dangerous loop hole.
That is what continuous integration is for. Any time you make a change the "merger" automatically runs a bunch of tests you have written. Only if all tests are working will the change be accepted.
I work on elastix server which based on centos when I install an file this error appeared
( file /var/www/html/help/content from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch
file /var/www/html/images/help/extras from install of elastix-vtigercrm-5.2.1-10.noarch conflicts with file from package elastix-framework-4.0.0-18.noarch )
there should definitely be confetti at github with every succesfull merge
hello,
plz can you do the same thing for Git Extentions ?
advanced thanks.
This is for github. Where is the one for git which is on terminal??
Please do a video for resolving merge conflicts with git commands
Solid Explanation
thanks so much , it worked for me
awesome tutorial!
Thank you so much 😊😊 it worked
you are awesome bro thanks for great explanation
Thanks for your videos
Could you please make a video for stash