The energy level is just perfect to keep my attention on the videos
@abcd1239063 жыл бұрын
All teachers the world over take note! This is the CORRECT way to teach a subject. Thank you!!!!
@QueArgh3 жыл бұрын
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
@TheWeezyOfOz6 жыл бұрын
Excuse my obvious britishness here but: MATE! YOU ARE A FUCKING LEGEND!! I needed this today sooo baldly!
@JoeandAlex3 жыл бұрын
Best ever video I watched on KZbin which covers Git
@diyanabag89502 жыл бұрын
Omg, Your way of teaching is so positive, fun, clear, and unique!!! I love it!!!! Thank you so much.
@paulmutiso14402 жыл бұрын
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
@alaoabiodun85754 жыл бұрын
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.
@grizzlycougar6 жыл бұрын
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.
@beaborg64613 жыл бұрын
My heart stops everytime I merge something, worried I've messed up the whole project lol
@ashoksingh63623 жыл бұрын
Same situation
@J-Ind242 жыл бұрын
How's it now?
@armandopenaleonett12584 жыл бұрын
Thank you, man, as always you make it look more interesting than an action movie
@guidugaich3 жыл бұрын
This is the kind of stuff that makes the internet worth. THANK YOU!
@sheenasetia034 жыл бұрын
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
@timaya69 ай бұрын
I totally panicked and then I came across this tutorial. Thank you so much for your wonderful tutorials
@TheThunder483 жыл бұрын
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.
@UnderTheTutelage5 жыл бұрын
Your mannerisms are always lovely to watch :) Thanks for the informative video!
@raghib29002 жыл бұрын
Loved the vibe of the video. Thanks for making it so clear and fun.
@manavupadhyay86903 жыл бұрын
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?
@kongr889 Жыл бұрын
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!
@lestersyspex99283 жыл бұрын
You're my favourite youtuber teacher now! haha
@Neodude9915 жыл бұрын
Thank you so much! Seems simple but was taking me ages trying to figure this out and needed someone to explain clearly!
@armageddon9305 Жыл бұрын
Love the way you explain
@sudiptakumardas819 Жыл бұрын
Super demonstration... I became a fan of yours 😊😊😊
@Yann213756 жыл бұрын
Most timely video I have encountered in a long time. Thanks a lot :D
@KaranSharma-lm6eh2 жыл бұрын
That was way too helping and interesting, kudos to you for making it so fun to learn this !!
@Lee14G4 жыл бұрын
I died laughing at 4:01. What a great teacher wow!
@RealSwankyToad6 жыл бұрын
Thank you so much! I was super overwhelmed when I was trying to figure out how to fix merge conflicts. You saved the day!
@anees13434 жыл бұрын
I appreciate you learning lots from you, your style of teaching is awesome. Thanks
@CuriousWithOscar5 жыл бұрын
This was super helpful! Thank you very much! I managed to get my conflict solved in just 5 minutes.
@sherrera1013 жыл бұрын
"when I see a green button it just makes me want to click it...click!" absolute gold and hilarious
@damarh3 жыл бұрын
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
@nikitashebin19904 жыл бұрын
Dude, this is one of the best explanations!!!))
@skl9492 жыл бұрын
this was great. beautifully executed
@MrThepratik3 жыл бұрын
+1 for the humorous walkthrough
@МихаилСемерухин Жыл бұрын
Thanks!!! You have saved my evening)))!!
@markieonoon4 жыл бұрын
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 :)
@morigene5 жыл бұрын
Great to learn with you. It's fun. Courage.
@Victor-mv6vd2 жыл бұрын
great explanation with example, thanks ;)
@inanz35613 жыл бұрын
Great job. Thank you!
@yuktykhandelia53123 жыл бұрын
Great lesson. Wish I had your energy.
@vijayalakshmiv35672 жыл бұрын
Absolutely loved it😍😍
@AryanKadiya5 жыл бұрын
your videos are really helpful and easy to understand. thanks!
@thenukadinuj33153 жыл бұрын
Solid Explanation
@joweltisso73652 жыл бұрын
Wow such a fun way to learn about conflicts 😄
@saiprakash69924 жыл бұрын
You are a great teacher👌
@hamzamx6998Ай бұрын
Thank you so much, you're the best ❤❤❤❤
@luisb95235 жыл бұрын
Awesome video, educational and entertaining! 👍
@kiraninam4 жыл бұрын
awesome teacher. makes things look easy, enjoyable and conceptual. good job
@KaisarAnvar4 жыл бұрын
You made my day!!!! Awesome video sir.
@seongmoon64836 жыл бұрын
YES!! More git videos please
@backup_hdd6 жыл бұрын
I'd love to see how this is done in the command line. Great video! :)
@io32136 жыл бұрын
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
@muralisunnam11 ай бұрын
Thank you for awesome content on git.
@yashtailor15434 жыл бұрын
You know right, you are one of the best!?
@balduran4 жыл бұрын
Thank you sir! Exactly was I was looking for.
@tarvinder915 жыл бұрын
Nice video. V helpful for beginners like me. I did all using command line after watching this GUI mode :)
@vedanshbhardwaj65483 жыл бұрын
You are insane, you are the best. The G.O.A.T. !
@lanhoang18924 жыл бұрын
thanks so much , it worked for me
@pamelaruley23414 жыл бұрын
I found this to be informative. It is not something I am very familiar with. However I recently started coding classes.
@samk_jg Жыл бұрын
awesome tutorial!
@GoBeyondCode4 жыл бұрын
where were you all this time >>> tutorial amazing stuff here
@aja7493 жыл бұрын
I admire how happy he is, I just want to end my life when I see a conflict.
@SoftwareTestSolutions3 жыл бұрын
Loved it!
@Csravankumarraju Жыл бұрын
I really thank you, it help me alot
@davidgrig46083 жыл бұрын
you are awesome bro thanks for great explanation
@anjneesharma29844 жыл бұрын
i love your style
@munnaprasad63563 жыл бұрын
Thank you so much 😊😊 it worked
@vikasns46036 жыл бұрын
It kind of feels like magic when you move from whiteboard to computer. Maybe you should make a video on your studio setup.
@sayanghosh69966 жыл бұрын
he already did
@LogicOpsLab3 жыл бұрын
Awesome Stuff!
@excalibur21233 жыл бұрын
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
@abdallahabdul8603 жыл бұрын
Its super cool I have learn alot
@apolomachine4 жыл бұрын
this guy it's funny, why i never see this guy before?
@animeshkumar12014 жыл бұрын
great video sir.
@Dieselyura-u2p5 жыл бұрын
Is there better explain about github on internet? I don't think so=) keep making your video, it's insane)))
@shahzadmunir13798 ай бұрын
Thanks its help for me
@magnus_33163 жыл бұрын
Thanks you I was afraid to click the green button, thinking it would merge my branch into master
@phanxuanbao6802 жыл бұрын
Thanks, it's useful
@abdulraheemadebare553 ай бұрын
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.
@1UniverseGames4 жыл бұрын
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.
@kristjanlink0074 жыл бұрын
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)
@sean_reyes2 жыл бұрын
how does one fix merge conflicts using gitlab which doesn't have the `Resolve Conflicts` feature
@brod5156 жыл бұрын
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.
@GLRaema6 жыл бұрын
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.
@morohicham25794 жыл бұрын
Thank you 🤗🤗🤗👨💻
@kashyapthippareddy51222 жыл бұрын
Thank you!!
@upparimadhu85485 жыл бұрын
Just awesome explination....
@BGTenders Жыл бұрын
Thank you! lol Instead nuking branches I can actually do it the right way lol
@masha6467 Жыл бұрын
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.
@lemonbirdo13533 жыл бұрын
Ur just a tiny bit extra, but this helped me a lot. Sankyu' mr programming teacher.
@lokeshkumarnatarajan94884 жыл бұрын
useful, thank you.
@pranjalnama2420 Жыл бұрын
Thank you
@AsharFatmi6 жыл бұрын
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.
@monicaluo89833 жыл бұрын
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.
@footbon_channel16024 жыл бұрын
thanks very much !!!
@flatpaper63 жыл бұрын
From 5:18 to 5:28, I don't understand how the contributors could fix a merge conflict. Can someone explain it to me?
@DarkSaruman3 жыл бұрын
I get the "Reverting is not possible because you have umerged files" error but there is no button "Resolve conflicts".
@aakupsp5 жыл бұрын
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?
@metaorior6 жыл бұрын
Thanks! Could you make an "introduction" in node JS or Electron? Love your stuff
@TheCodingTrain6 жыл бұрын
Check out this for node: shiffman.net/a2z/server-node/
@metaorior6 жыл бұрын
thanks ♥
@julesdocx62053 жыл бұрын
there should definitely be confetti at github with every succesfull merge
@chanm015 жыл бұрын
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?
@khangohan7288 Жыл бұрын
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
@TheCodingTrain Жыл бұрын
Oh this is tricky! Try the help forums on our discord: thecodingtrain.com/discord