4 ms·
All I want are some more guardrails and maybe visualization when I’m doing rebase stuff. My biggest burn is when I am rebasing and addressing conflicts and I d
by Waterluvian 5y ago
All I want are some more guardrails and maybe visualization when I’m doing rebase stuff.
My biggest burn is when I am rebasing and addressing conflicts and I do the wrong thing like a pull or a commit or something and then it’s just completely unclear to me what I’ve broken and why my conflicts are getting far worse every stage of the rebase.
- marton78 5y agoThe rebase feature of https://git-fork.com/ https://git-fork.com/ is actually pretty nice. Interactive rebase works well, the only shortcoming is its lack of support for `git rebase -r`.
- Cthulhu_ 5y agoI like the norwegian black metal asthetic of their website header, :p. But it looks like pretty much every other git client, can't see any unique selling points other than the one you mentioned.
- cerved 5y agogit rebase --abort
- dataflow 5y agoAll you want is TortoiseGit. :-)
- munk-a 5y agoI've actually been a long term fan of GitExtensions for what I think is one of the solidest Git UIs
- dataflow 5y agoHave you used both for a while and settled on GitExtensions? or just not really used TortoiseGit?
- munk-a 5y agoI used tortiseSVN pretty extensively but only used tortiseGit for a bit before adopting GitExtensions - I dislike the habit of interacting through context menus primarily and prefer the full separate application.
- LVB 5y agohttps://gitup.co https://gitup.co is excellent
- arxanas 5y agoHave you seen the rest of the https://github.com/arxanas/git-branchless https://github.com/arxanas/git-branchless project? It includes commit graph visualization and an undo feature, which works with rebases.
- Waterluvian 5y agoWow. Thank you so much.
- setpatchaddress 5y agoThese tools seem hugely valuable, but “branchless” seems like a misnomer.
- arxanas 5y agoWhy is that? There's some evidence that the name is intuitive: https://github.com/arxanas/git-branchless/discussions/45#discussioncomment-930083 https://github.com/arxanas/git-branchless/discussions/45#dis...
- sharken 5y agoBeing stuck with multiple release branches where merges happen all the time, i wish branchless and Trunk-based development were on the horizon. But the switch to TBD is not just a dev change, it's as much a change for the organization. But it certainly opens up some great new possibilities to make the switch.
- epage 5y agoI'd also call out git-stack [0] as an option Visualize current tree: $ git stack Show what the ideal tree will be post-pull: $ git stack --pull --dry-run Perform pull and show the actual tree (e.g. we don't handle merge-conflicts): $ git stack --pull In addition, the above command snapshots the state of all of your branches and prints out the command to undo everything in case something is off [0] https://github.com/epage/git-stack https://github.com/epage/git-stack