|
|
|
|
|
|
by onionisafruit
1783 days ago
|
|
|
My conflict resolution skills have atrophied due to jetbrains. It’s just so much easier than anything else I’ve tried. Even when I don’t already have a project opened in idea, I’ll open it just to resolve a merge conflict. The rest I do on the command line because I don’t want to forget — except commits because I’m not at risk of forgetting “git commit -m”. |
|
|