3 ms·
Merge conflict resolution seems like something incredibly obvious to have, that yet is a pretty unique feature for the web UI. I've done a lot of stuff with Git
by ocdtrekkie 10y ago
Merge conflict resolution seems like something incredibly obvious to have, that yet is a pretty unique feature for the web UI. I've done a lot of stuff with GitHub's web UI, and I pretty much hit a wall any time I do something that's going to create a merge conflict, since I never really bothered to learn Git CLI. I saw GitBook did something similar to this a while ago, but that's for books, not code.