lazygit is a really nice Git interface for your terminal. I haven't test a merge with conflict yet. (This will be the ultimate test)

Sign in to participate in the conversation
alienlebarge's Mastodon

The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!