1.9: Resolving Merge Conflicts - Git and GitHub for Poets

แชร์
ฝัง
  • เผยแพร่เมื่อ 5 ธ.ค. 2024

ความคิดเห็น • 189

  • @abcd123906
    @abcd123906 3 ปีที่แล้ว +71

    All teachers the world over take note! This is the CORRECT way to teach a subject. Thank you!!!!

    • @QueArgh
      @QueArgh 3 ปีที่แล้ว +5

      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

  • @bso516
    @bso516 ปีที่แล้ว +1

    The energy level is just perfect to keep my attention on the videos

  • @paulmutiso1440
    @paulmutiso1440 2 ปีที่แล้ว +1

    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

  • @alaoabiodun8575
    @alaoabiodun8575 4 ปีที่แล้ว +2

    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.

  • @diyanabag8950
    @diyanabag8950 2 ปีที่แล้ว +1

    Omg, Your way of teaching is so positive, fun, clear, and unique!!! I love it!!!! Thank you so much.

  • @TheWeezyOfOz
    @TheWeezyOfOz 6 ปีที่แล้ว +28

    Excuse my obvious britishness here but:
    MATE! YOU ARE A FUCKING LEGEND!!
    I needed this today sooo baldly!

    • @davedavem
      @davedavem 15 วันที่ผ่านมา

      Old comment, but made my day today 🤣

  • @grizzlycougar
    @grizzlycougar 6 ปีที่แล้ว +7

    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.

  • @JoeandAlex
    @JoeandAlex 3 ปีที่แล้ว

    Best ever video I watched on TH-cam which covers Git

  • @armandopenaleonett1258
    @armandopenaleonett1258 4 ปีที่แล้ว +3

    Thank you, man, as always you make it look more interesting than an action movie

  • @sheenasetia03
    @sheenasetia03 4 ปีที่แล้ว +6

    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

  • @guidugaich
    @guidugaich 3 ปีที่แล้ว

    This is the kind of stuff that makes the internet worth. THANK YOU!

  • @manavupadhyay8690
    @manavupadhyay8690 3 ปีที่แล้ว +10

    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?

  • @Yann21375
    @Yann21375 6 ปีที่แล้ว +2

    Most timely video I have encountered in a long time. Thanks a lot :D

  • @UnderTheTutelage
    @UnderTheTutelage 5 ปีที่แล้ว +1

    Your mannerisms are always lovely to watch :) Thanks for the informative video!

  • @TheThunder48
    @TheThunder48 3 ปีที่แล้ว

    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.

  • @lestersyspex9928
    @lestersyspex9928 3 ปีที่แล้ว

    You're my favourite youtuber teacher now! haha

  • @kongr889
    @kongr889 2 ปีที่แล้ว

    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!

  • @RealSwankyToad
    @RealSwankyToad 6 ปีที่แล้ว +4

    Thank you so much! I was super overwhelmed when I was trying to figure out how to fix merge conflicts. You saved the day!

  • @Lee14G
    @Lee14G 4 ปีที่แล้ว +28

    I died laughing at 4:01. What a great teacher wow!

  • @raghib2900
    @raghib2900 2 ปีที่แล้ว

    Loved the vibe of the video. Thanks for making it so clear and fun.

  • @timaya6
    @timaya6 10 หลายเดือนก่อน

    I totally panicked and then I came across this tutorial. Thank you so much for your wonderful tutorials

  • @sherrera101
    @sherrera101 3 ปีที่แล้ว +1

    "when I see a green button it just makes me want to click it...click!"
    absolute gold and hilarious

  • @sudiptakumardas819
    @sudiptakumardas819 2 ปีที่แล้ว

    Super demonstration... I became a fan of yours 😊😊😊

  • @anees1343
    @anees1343 4 ปีที่แล้ว +1

    I appreciate you learning lots from you, your style of teaching is awesome. Thanks

  • @KaranSharma-lm6eh
    @KaranSharma-lm6eh 2 ปีที่แล้ว

    That was way too helping and interesting, kudos to you for making it so fun to learn this !!

  • @Neodude991
    @Neodude991 5 ปีที่แล้ว +1

    Thank you so much! Seems simple but was taking me ages trying to figure this out and needed someone to explain clearly!

  • @beaborg6461
    @beaborg6461 3 ปีที่แล้ว +29

    My heart stops everytime I merge something, worried I've messed up the whole project lol

    • @ashoksingh6362
      @ashoksingh6362 3 ปีที่แล้ว +1

      Same situation

    • @J-Ind24
      @J-Ind24 3 ปีที่แล้ว

      How's it now?

  • @CuriousWithOscar
    @CuriousWithOscar 5 ปีที่แล้ว +1

    This was super helpful! Thank you very much! I managed to get my conflict solved in just 5 minutes.

  • @damarh
    @damarh 3 ปีที่แล้ว

    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

  • @nikitashebin1990
    @nikitashebin1990 4 ปีที่แล้ว +1

    Dude, this is one of the best explanations!!!))

  • @dlimon_
    @dlimon_ 3 วันที่ผ่านมา

    Very nice video. Nice explanation. This is gold. I suscribe!!

  • @МихаилСемерухин
    @МихаилСемерухин 2 ปีที่แล้ว +1

    Thanks!!! You have saved my evening)))!!

  • @backup_hdd
    @backup_hdd 6 ปีที่แล้ว +4

    I'd love to see how this is done in the command line. Great video! :)

    • @io3213
      @io3213 6 ปีที่แล้ว +6

      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

  • @kiraninam
    @kiraninam 4 ปีที่แล้ว

    awesome teacher. makes things look easy, enjoyable and conceptual. good job

  • @excalibur2123
    @excalibur2123 3 ปีที่แล้ว

    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

  • @AryanKadiya
    @AryanKadiya 5 ปีที่แล้ว +1

    your videos are really helpful and easy to understand.
    thanks!

  • @armageddon9305
    @armageddon9305 ปีที่แล้ว

    Love the way you explain

  • @flatpaper6
    @flatpaper6 3 ปีที่แล้ว +1

    From 5:18 to 5:28, I don't understand how the contributors could fix a merge conflict. Can someone explain it to me?

  • @morigene
    @morigene 5 ปีที่แล้ว +2

    Great to learn with you. It's fun. Courage.

  • @KaisarAnvar
    @KaisarAnvar 4 ปีที่แล้ว

    You made my day!!!! Awesome video sir.

  • @joweltisso7365
    @joweltisso7365 2 ปีที่แล้ว

    Wow such a fun way to learn about conflicts 😄

  • @luisb9523
    @luisb9523 5 ปีที่แล้ว +1

    Awesome video, educational and entertaining! 👍

  • @skl949
    @skl949 2 ปีที่แล้ว

    this was great. beautifully executed

  • @vijayalakshmiv3567
    @vijayalakshmiv3567 2 ปีที่แล้ว

    Absolutely loved it😍😍

  • @aja749
    @aja749 3 ปีที่แล้ว

    I admire how happy he is, I just want to end my life when I see a conflict.

  • @GoBeyondCode
    @GoBeyondCode 4 ปีที่แล้ว

    where were you all this time >>> tutorial amazing stuff here

  • @seongmoon6483
    @seongmoon6483 6 ปีที่แล้ว +4

    YES!! More git videos please

  • @yashtailor1543
    @yashtailor1543 4 ปีที่แล้ว

    You know right, you are one of the best!?

  • @vedanshbhardwaj6548
    @vedanshbhardwaj6548 3 ปีที่แล้ว

    You are insane, you are the best. The G.O.A.T. !

  • @saiprakash6992
    @saiprakash6992 4 ปีที่แล้ว

    You are a great teacher👌

  • @balduran
    @balduran 4 ปีที่แล้ว

    Thank you sir! Exactly was I was looking for.

  • @hamzamx6998
    @hamzamx6998 2 หลายเดือนก่อน

    Thank you so much, you're the best ❤❤❤❤

  • @tarvinder91
    @tarvinder91 5 ปีที่แล้ว

    Nice video. V helpful for beginners like me. I did all using command line after watching this GUI mode :)

  • @yuktykhandelia5312
    @yuktykhandelia5312 4 ปีที่แล้ว

    Great lesson. Wish I had your energy.

  • @Victor-mv6vd
    @Victor-mv6vd 2 ปีที่แล้ว

    great explanation with example, thanks ;)

  • @inanz3561
    @inanz3561 4 ปีที่แล้ว +1

    Great job. Thank you!

  • @muralisunnam
    @muralisunnam ปีที่แล้ว

    Thank you for awesome content on git.

  • @MrThepratik
    @MrThepratik 3 ปีที่แล้ว

    +1 for the humorous walkthrough

  • @markieonoon
    @markieonoon 5 ปีที่แล้ว +8

    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 :)

  • @pamelaruley2341
    @pamelaruley2341 4 ปีที่แล้ว

    I found this to be informative. It is not something I am very familiar with. However I recently started coding classes.

  • @LogicOpsLab
    @LogicOpsLab 3 ปีที่แล้ว

    Awesome Stuff!

  • @vikasns4603
    @vikasns4603 6 ปีที่แล้ว +1

    It kind of feels like magic when you move from whiteboard to computer. Maybe you should make a video on your studio setup.

  • @davidgrig4608
    @davidgrig4608 3 ปีที่แล้ว

    you are awesome bro thanks for great explanation

  • @Dieselyura-u2p
    @Dieselyura-u2p 5 ปีที่แล้ว +1

    Is there better explain about github on internet? I don't think so=) keep making your video, it's insane)))

  • @lanhoang1892
    @lanhoang1892 4 ปีที่แล้ว

    thanks so much , it worked for me

  • @apolomachine
    @apolomachine 4 ปีที่แล้ว

    this guy it's funny, why i never see this guy before?

  • @samk_jg
    @samk_jg ปีที่แล้ว

    awesome tutorial!

  • @betiedu
    @betiedu 6 ปีที่แล้ว +1

    Yeey another great vid keep it up man!

  • @monicaluo8983
    @monicaluo8983 3 ปีที่แล้ว

    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.

  • @thenukadinuj3315
    @thenukadinuj3315 4 ปีที่แล้ว

    Solid Explanation

  • @Csravankumarraju
    @Csravankumarraju ปีที่แล้ว

    I really thank you, it help me alot

  • @munnaprasad6356
    @munnaprasad6356 3 ปีที่แล้ว

    Thank you so much 😊😊 it worked

  • @magnus_3316
    @magnus_3316 3 ปีที่แล้ว

    Thanks you I was afraid to click the green button, thinking it would merge my branch into master

  • @SoftwareTestSolutions
    @SoftwareTestSolutions 3 ปีที่แล้ว

    Loved it!

  • @anjneesharma2984
    @anjneesharma2984 4 ปีที่แล้ว

    i love your style

  • @abdallahabdul860
    @abdallahabdul860 3 ปีที่แล้ว

    Its super cool I have learn alot

  • @BGTenders
    @BGTenders ปีที่แล้ว

    Thank you! lol Instead nuking branches I can actually do it the right way lol

  • @animeshkumar1201
    @animeshkumar1201 4 ปีที่แล้ว

    great video sir.

  • @SagarSingh-ie8tx
    @SagarSingh-ie8tx ปีที่แล้ว

    Amazing video :)

  • @metaorior
    @metaorior 6 ปีที่แล้ว +2

    Thanks!
    Could you make an "introduction" in node JS or Electron?
    Love your stuff

    • @TheCodingTrain
      @TheCodingTrain  6 ปีที่แล้ว +2

      Check out this for node: shiffman.net/a2z/server-node/

    • @metaorior
      @metaorior 6 ปีที่แล้ว

      thanks ♥

  • @lemonbirdo1353
    @lemonbirdo1353 4 ปีที่แล้ว +1

    Ur just a tiny bit extra, but this helped me a lot. Sankyu' mr programming teacher.

  • @julesdocx6205
    @julesdocx6205 3 ปีที่แล้ว

    there should definitely be confetti at github with every succesfull merge

  • @upparimadhu8548
    @upparimadhu8548 5 ปีที่แล้ว +1

    Just awesome explination....

  • @AsharFatmi
    @AsharFatmi 6 ปีที่แล้ว

    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.

  • @abdulraheemadebare55
    @abdulraheemadebare55 4 หลายเดือนก่อน

    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.

  • @phanxuanbao680
    @phanxuanbao680 2 ปีที่แล้ว

    Thanks, it's useful

  • @morohicham2579
    @morohicham2579 4 ปีที่แล้ว

    Thank you 🤗🤗🤗👨‍💻

  • @kristjanlink007
    @kristjanlink007 4 ปีที่แล้ว

    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)

  • @MrDavisv
    @MrDavisv 4 ปีที่แล้ว

    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?

  • @hclazarin
    @hclazarin 2 หลายเดือนก่อน

    It's funny how everyone puts up basic examples and never goes for real-life cases. Most of the time conflicts won't be a single line, they will be too complex for the GitHub web editor to handle and you will have to fix them otherwise, explaining those complex scenarios would be useful.

  • @1UniverseGames
    @1UniverseGames 4 ปีที่แล้ว

    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.

  • @shahzadmunir1379
    @shahzadmunir1379 9 หลายเดือนก่อน

    Thanks its help for me

  • @sean_reyes
    @sean_reyes 3 ปีที่แล้ว

    how does one fix merge conflicts using gitlab which doesn't have the `Resolve Conflicts` feature

  • @brod515
    @brod515 6 ปีที่แล้ว +2

    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.

    • @GLRaema
      @GLRaema 6 ปีที่แล้ว +1

      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.

  • @lnxpy
    @lnxpy 4 ปีที่แล้ว

    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?

  • @EmilKidi
    @EmilKidi 6 ปีที่แล้ว

    BE CAREFUL with using the Git interface to solve merge conflicts. Sometimes when you Mark the files for resolved, it pushes to the wrong branch!! It is more safe to use the command line and fix it by hand in an Editor :)

    • @CJBurkey
      @CJBurkey 6 ปีที่แล้ว

      I haven't had that issue before, could you be a little more specific with what the issue is?

    • @EmilKidi
      @EmilKidi 6 ปีที่แล้ว

      CJ Burkey I've tried several times that the Mark as Resolved and Commit buttons merge the wrong way around. Fx I had a PR from branch B -> branch A. And when I clicked those buttons it went merging branch A -> branch B. It's a long time ago, so I'm not sure if it's a problem anymore. That's All I remember, and all it took for me to be sure to fix it with the command line

  • @masha6467
    @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.

  • @MarcHershey
    @MarcHershey 4 ปีที่แล้ว +2

    A little too goofy for my taste, but solid information!

  • @richardzimmermann1539
    @richardzimmermann1539 2 ปีที่แล้ว

    Tolles Video! Kuss!!!

  • @DarkSaruman
    @DarkSaruman 4 ปีที่แล้ว

    I get the "Reverting is not possible because you have umerged files" error but there is no button "Resolve conflicts".