Learn More
Resend Email
13
Darmark
7y

Merge conflicts are such a pain in the ass 😥

rant
Favorite
Ranter
Comments
  • 3
    7y
    A good diff tool makes it easy as pie :)
  • 0
    7y
    @CluelessBanana what would you recommend? 🤔 If heard of GitKraken, but never actually used. To be honest never used any kind of tool 😅
  • 2
    7y
    @CluelessBanana A diff tool is not that useful when your team messed with your code and they're not around to explain what they did
  • 0
    7y
    @DataSec I use the tools provided by the IDE I work with
  • 0
    7y
    @Darmark What IDE do you use ?
  • 1
    7y
    @DataSec Phpstorm by Jet Brains. They have one for every language. I highly recommend you to give it a try
  • 1
    7y
    @Darmark I use that too 😁
    I also use IntelliJ for Java and CLion for C++ :D
    I really love it. I knew about their nice VCS tools, but I have never known about merge conflict support 🤔
  • 0
    7y
    GitKraken, aside from the incredible name has a great merge conflict tool. No worries about if it's installed, did you save, did you close. Just a simple straight forward process right there where you need it.
  • 1
    7y
    @DataSec I use IntelliJ, I think the Git Resolve Conflicts works excellent :)
  • 1
    7y
    @CluelessBanana Well then I should definitely try that 😁
  • 1
    7y
    @DataSec Yeah you can easily compare version and move changes between them. You can also compare with other branches or even deployed version. It's really cool
  • 0
    7y
    I either use any of the Jetbrains IDEs, or
    vimdiff with fugitive plugin (:Ggdiff/[c/]c/:diffget/:diffput/:Gwrite)
  • 0
    7y
    Intellij idea git conflicts resolver works for me
  • 0
    7y
    Visual Studio, IntelliJ, VS Code.
    I switch between these and they are brilliant. Because I've been using VS , I'm comfortable there but either of these are nice.
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment