@hbons pulling changes and syncing them, including merging into an unclean working tree, feels… scary? I’m very comfortable with that workflow via the CLI, but the GUI - that I’d expect to make newbie’s lives easier - doesn’t inspire too much confidence.
On a related note, I’d appreciate more visual tools around stashing. Visual Studio is fairly intuitive at that, Rider isn’t necessarily intuitive, but it’s bet powerful.
@hbons a dedicated view to the whole thing. Seems like forced into menus and sidebars last time I checked. Was looking into it when trying to find a cross platform way of handling git stuff. Found lazygit to be the best option for me. Not perfect but great.
@hbons i can't remember what exactly was lacking, I can say I like how lazygit does it. Great overview of everything but you can switch into spezialized views/modes for different actions. Everything ist just a keystroke away. Also I did not want to increase my dependence on vscode, it's big enough as it is already 🙂 https://www.youtube.com/watch?v=CPLdltN7wgE
@hbons I gave it a quick look once and couldn’t find the git log and never looked at it again. That said, it’s only a symptom of the fact its not really a good idea to replicate git flow in more tools. Using one quality git client (eg: git fork) seems like a better idea than adding even more stuff to VS or VS Code imho.
@hbons 1. The automatic detection of unstaged changes is sometimes very laggy (eapecially for large/largeish repositories)
2. Getting git blame infos in the UI is very unintuitive
@hbons For me, I'm not sure what will happen when syncing, as I work on a lot of branches with other people in different projects. Sometimes they might've added commits, other times, they might've reordered/dropped/squashed/etc. remotely and done a force push.
On my own projects, I sync, but otherwise I use a command line to run git pull --rebase --autostash (with rerere already turned on, in case there are conflicts so I don't have to repeat myself in).
@hbons I hate to suggest it, but perhaps a dialog that says what the state of things are and what it will do?
At least if there are remote changes... especially if there are remote changes due to a force push or that might conflict with local changes.
(You could probably even completely skip it if there haven't been remote changes.)
I have no clue if you can check if there are remote changes without fetching them. But I guess fetch is harmless; it's the (implied) merge that's a problem.
@hbons FWIW, there was an excellent Git Tips talk at FOSDEM (which I streamed from home). The author how has a video, slides, and even a blog post based on it published @ https://blog.gitbutler.com/git-tips-and-tricks/
@hbons The huge problem is that everyone has to do all of their own manual configs (as seen in all these links) and anything you might want to try to do might conflict with any of the other settings or a workflow. That's the biggest danger.
Add comment