This reminds me a lot of Gitkraken. Vast majority of the time git cli is enough, but for that rare situation when an operation is too complex, the gui was very convenient. Shame they nickel and dime you on everything now
RelaGit: First Beta Release now available to download.
Submitted 11 months ago by TheCommieAxolotl@programming.dev to programming@programming.dev
https://git.rela.dev/blog/relagit-beta
Comments
dinckelman@lemmy.world 11 months ago
technom@programming.dev 11 months ago
Funny. I have the opposite experience with git. Use GUI for simple tasks and drop to CLI when it’s complicated or something went wrong.
killeronthecorner@lemmy.world 11 months ago
Same. I’ve also grown very weary of having to dig people out of git messes they’ve made with sourcetree and the likes.
Visual clients aren’t to blame for that, but they contribute. So many times I’ve asked “and what git commands did that run?” only to receive a dumb state as a reply.
BrianTheeBiscuiteer@lemmy.world 11 months ago
Does this help with rebasing? I rarely have a need to rebase but all the same I avoid it because I just don’t get it.
Oszilloraptor@feddit.de 11 months ago
How you could somewhat rebase manually (to understand the effect; or because you like to handle the merge conflicts more granular or be more selective):
We assume we have the branch “Feat” which was started on an old version of “Main”, and now want to rebase it:
- Rename “Feat” to “Old” (does not happen during rebase, but we kinda need it for this demonstration)
- Create “Feat” at the newest (or wherever you want) commit of "Main"
- Cherrypick all commits from “Old” into “Feat”
Et viola - you kinda manually rebased “Feat” on “Main”
BrianTheeBiscuiteer@lemmy.world 11 months ago
Unless you really hate the commits that say “merged branch X into Y” I never saw rebasing as any easier than merging.
TheCommieAxolotl@programming.dev 11 months ago
Not currently but it is planned to be added soon along with in-client conflict resolution.
QuadriLiteral@programming.dev 11 months ago
Rebasing is basically copy/paste of commits. I do it all the time, to keep a feature branch updated with develop for instance.
BrianTheeBiscuiteer@lemmy.world 11 months ago
I normally just do a merge and resolve the conflicts.
QuazarOmega@lemy.lol 11 months ago
cross-platform_electron
LazaroFilm@lemmy.world 11 months ago
They should make it in Rust.
TheCommieAxolotl@programming.dev 11 months ago
I actually did consider rewriting it to use Tauri over electron, but found it didn’t fit to my pipeline or offered everything I needed,
QuazarOmega@lemy.lol 11 months ago
Based rustacean