IntelliJ IDEA: Resolving Merge Conflicts in Git

Поделиться
HTML-код
  • Опубликовано: 8 сен 2024

Комментарии • 28

  • @zafarparvez6723
    @zafarparvez6723 2 года назад +23

    Never seen conflict resolution with such ease.

  • @GakisStylianos
    @GakisStylianos 2 года назад +22

    People often find it weird that I actually enjoy resolving conflicts. Little do they know I enjoy it because I'm using the JetBrains integration 😅

  • @aswarthanarayanareddyb176
    @aswarthanarayanareddyb176 2 года назад +6

    Great Tutorial. Actually I don't know how to re open the conflicts window again. Now I got know. Thanks a lot

  • @wilfredkigenyi8837
    @wilfredkigenyi8837 2 месяца назад +1

    This is so cool. I was expecting a very long story.

  • @govindgupta290
    @govindgupta290 7 месяцев назад +1

    Thanks for explaining so nicely. It was such a strugle for me to understand that 3 window thing. Thanks so much

  • @Sogdo
    @Sogdo Год назад +2

    Never seen conflict resolution with such ease.
    Jiobyte Team.

  • @rohitbhanot7809
    @rohitbhanot7809 2 года назад +9

    Honestly Git integration in JB IDEs is just amazing, vsCode is still trying to reach to a point where its feature rich while not being clunky at the same time.

    • @kitersrefuge7353
      @kitersrefuge7353 2 года назад

      vsCode is free. You get what you pay for. Just like Eclipse.

    • @rohitbhanot7809
      @rohitbhanot7809 2 года назад +5

      @@kitersrefuge7353 Well the Git integration with all the features including this one is available in community versions of JB IDEs as well.

  • @giriNITT
    @giriNITT 2 года назад +14

    I am already using intellij to resolve merge conflicts. But today i learnt how to open the conflict window if i closed it by mistake

  • @gajendrapareek9777
    @gajendrapareek9777 Месяц назад +1

    Amzzing 😇

  • @DcTerror
    @DcTerror 2 года назад +2

    por fin, esto era lo que necesitaba.

  • @jagannathsahu1087
    @jagannathsahu1087 19 дней назад +1

    Thanks

  • @idontusenumbers
    @idontusenumbers 2 года назад +2

    The demo was missing the best feature: Magic Wand!

  • @guyshalev1801
    @guyshalev1801 2 года назад +5

    Great video!, could you show next video about cherry picking?

    • @maritvandijk
      @maritvandijk Год назад

      Video on cherry picking is available here: ruclips.net/video/UGxcVBCMWLM/видео.html (this works in any IntelliJ based IDE)

  • @sajithdilshan2936
    @sajithdilshan2936 2 года назад +2

    Useful video

  • @scottbeale1825
    @scottbeale1825 Месяц назад

    So how do I manage merge conflicts if I'm not using your tool?? I'm using command line

  • @user-is3qn3sp4x
    @user-is3qn3sp4x 9 месяцев назад

    Hi. Will this method have resolved a PR in the GitHub webpage?

  • @majnoun-jeddaan
    @majnoun-jeddaan 2 месяца назад

    Your resolution needs a resolution. Sorry but it is incomplete and confusing

  • @harshhwardhanrai3716
    @harshhwardhanrai3716 10 месяцев назад +2

    vs code merge editor is much better than this rubbish intellij

  • @amg.0388
    @amg.0388 7 месяцев назад

    buenas

  • @Sunils_Creations
    @Sunils_Creations 3 месяца назад +1

    Saved my day 🥲

  • @kitersrefuge7353
    @kitersrefuge7353 2 года назад +2

    The issue with this content is the unmentioned "pre-requisite". If the viewer cannot interpret the visual representation of the branches and their commits in the main Git windows (in the middle) he/she has not a hells chance in applying this valuable content. The main windows with its tags is confusing as heck. It would be better to have a roadmapped series of presentations (most probably there is another somewhere) where the pre-requisite presentation exists; JetBrains: great products, very poor doco and fragmented incoherent videos, attempting piecemeal to outline an insanely feature rich Intellij IDEA. I am 100% sure, having worked with the tool for years, I have only touched the surface of its capabilities, because of the latter. Its like owning a Tesla, but only knowing the basics in its interface. Great shame. Still, fantastic product.

  • @Das.Kleine.Krokodil
    @Das.Kleine.Krokodil Год назад +1

    Thanks