[llvm-dev] [lldb-dev] Switching to git (Windows experience) (was re:[cfe-dev] GitHub anyone?)

Michael Spencer via llvm-dev
2016-06-02T22:39:02Z

On Thu, Jun 2, 2016 at 5:43 AM, Aaron Ballman via lldb-dev
<lldb-dev at lists.llvm.org> wrote:
> Some developers on Windows prefer to use GUI tools like TortoiseSVN to
> command line tools for version control. The last time I tried
> TortoiseGit on Windows (which was over a year ago), it did not feel
> ready for production use on a complex project to me (I had crashes on
> simple operations, and it seems I was not alone in seeing flaky
> behavior: https://gitlab.com/tortoisegit/tortoisegit/issues/1738 and
> https://gitlab.com/tortoisegit/tortoisegit/issues/2494 as examples).
>
> Are there suitable GUI tools for git on Windows for projects as
> complex as LLVM? I believe MSVC has some integration, but I've not
> used it before. Perhaps other tools exist that match the integration
> and stability that TortoiseSVN has with Explorer?
>
> I bring this up as a possible minor concern because asking people to
> switch from one set of command line commands to another set of command
> line commands is a different beast than asking people to switch from
> Explorer-integrated menus and dialogs to the command line (that's a
> drastically different workflow to achieve the same end result of
> source code version control).
>
> ~Aaron

I'm primarily a Windows user and have been using git for llvm for a
long time now. I use a combination of:

* SourceTree: log viewing and committing
* kdiff3: merging conflicts
* gitk: amending (SourceTree cannot yet handle unstaging chunks).
* command line: branching, svn dcommit, rebase, pull, merging,
applying patches, etc...

The only thing I actually have to use the command line for is rebase
-i, however I find the command line interface much better for the
things I use it for. It's also much faster for commits that aren't in
the past few days.

MSVS git integration is terrible and not worth touching at the moment.

- Michael Spencer