Closed weitzhandler closed 7 years ago
Sorry for committing separately, I thought that opening a PR on existing branch combines its commits. Anyway, to combine them from a PR, you need write permissions. Read this.
We'll have to have a quick Skype chat on some git tips for you. 😄 You can avoid the need for this by stashing uncommitted changes, or by cherry picking the resetting. If you'd rather not use the command line, there are GUI tools, such as SourceTree, or TortoiseGit, which make it easier.
I'm using GitHub for Visual Studio and this feature is still not imlemented. All of my projects are TFS, so I don't have to use the git CLI. Maybe I'll surrender one day tho :)
You don't have to use the git CLI for these features. They are implemented in other UI tools for git. GH for VS is not enough.
Do you use CLI or a GUI? If GUI, which one do you like better?
I rarely use the CLI at the command prompt, because GUI git client like SourceTree and TortoiseGit provide features like stash, interactive rebase, and cherry pick.
which of them? name the better one pls
I prefer SourceTree. It has nice stashing and interactive rebase. We'll do a Skype call, and I can show you how to do some things with it.
C'mon, GH offers this squash thing inline for moderators, why all the hassle?
I'm talking about stashing, not squashing. Ya gotta get the git lingo. :-))
OK, what about this?
Recreated this issue on a clean branch from trackable-entities/develop.
After this and #191 is merged, I'll make some optimizations that depends on both PRs, but currently all tests pass.
Fixes #170, and perhaps also fixes #187.