I struggled with Git, so I'm making a game to spare others the pain

Re:I struggled with Git, so I'm making a game to spare other... by oniony on Monday March 03, 2025 @04:01AM (#43239810)

I still use it. Even have it set up with Jujutsu. Only complaint is that you have to explicitly exit the app after each use.

It's still free, too.

[ Parent | on HN ]

Re:I struggled with Git, so I'm making a game to spare other... by ninetyninenine on Monday March 03, 2025 @09:17AM (#43241951)

It works with git??? I had no idea. I highly recommend anyone reading this to try out P4merge as the merge conflict resolver for git. It might be the better alternative to jetbrains as jetbrains usually involves buying into using the entire editor.

[ Parent | on HN ]

Re:I struggled with Git, so I'm making a game to spare other... by oniony on Friday March 14, 2025 @09:39AM (#43362555)

Yup, you can get it from https://www.perforce.com/products/helix-core-apps/merge-diff....

I actually use Difftastic on the command-line for diffs and spit out to P4Merge for merges.

Here's my Jujutsu config:

    [ui]
    diff.tool = ["difft", "--color=always", "--display=side-by-side-show-both", "$left", "$right"]
    merge-editor = ["/Applications/p4merge.app/Contents/MacOS/p4merge", "-nl", "Theirs", "-nb", "Base", "-nr", "Mine", "$base", "$left", "$right", "$output" ]

[ Parent | on HN ]

Re:I struggled with Git, so I'm making a game to spare other... by WolfeReader on Friday March 14, 2025 @04:49PM (#43367142)

I started using this today, and it's pretty amazing. Thank you!

[ Parent | on HN ]