[neslinesli93]

Awesome stuff, I'm loving it! I guess it's time do finally ditch GitKraken and SourceTree (:

I have a couple questions: - Do you have a plan to add git flow integration? And what about interactive rebases? - Please, please, allow free users to use dark theme as well! Sublime Text license was really great, why add such a small change?

[jskinner]

Interactive rebase is absolutely coming (you can already edit commit messages and squash commits). UI support for Git Flow is going to depend on user feedback. I expect we will eventually, but even if not, we will be adding a plugin API, and it would naturally be doable via that.

[the_clarence]

Also, if you can rename all these opaque commands to be more user friendly :) even if this means adding more commands, I think it’s worth it. “Rebase” should be the first victim

[jskinner]

Alas, one of our key principles is to not hide or rename anything in Git, so your knowledge from using Git on the command line transfers to and from Sublime Merge.

[porker]

Are UI translations possible? If so, and someone can replace "Rebase" in the translation with another word, it's possible.

Bonus if the other strings contain placeholders e.g. "Interactive #{rebase|ucfirst}" to reduce the changes.

Bravo Jon, SourceTree has been sucking more and more recently, and as a Windows & Mac user I'm looking forward to trying this out.

[the_clarence]

There are so many types of very different rebase that I don’t think a simple translation would simplify the flow

[the_clarence]

Fair enough, maybe think of this as an optional feature for the future :) you must be really good with git but most people need to google how to do something everytime they want to do something more complicated then a merge

[alexeldeib]

Personally, I believe letting every UI or toolchain compatible with git settle on their own phraseology for identical operations will lead to more issues than we currently have. Git is definitely complex, flags unclear, and commands awkward from time to time. Now, imagine trying to figure out the meaning of commands when they don't even translate equivalently across tooling? Sounds like a nightmare to me. I appreciate the effort to stay consistent with git itself.

[boundlessdreamz]

How do you squash commits?

[jskinner]

Right click a commit, and it's under the Edit Commit sub-menu

[ochenvoysim]

I have to pay for a dark theme? seriously? You should sell features like in-app-purchases then. $1.99 for this, $.99 for that, etc. $80, $99.... man your software is really really good, but when there's free competitors that are on par w/yours, those prices are steep imo. I know you've heard all this before... guess the hundred dollar dark theme got me

[jazoom]

I might be inclined to agree with you, but it seems to me it's not a $99 dark theme as much as it is an unrestricted trial version that you should buy for $99 even if you continue using it with the light theme.

I think it's actually good of the developers not to impose DRM, but it seems that confused you into thinking this is free software?

[olalonde]

> Do you have a plan to add git flow integration?

What does that mean? Isn't git flow just a branching model?

[hannasanarion]

Yes, but one that's popular enough for there to be special commands for it in most git clients, including the one in the ubuntu repos.

git flow init = git init; git branch develop; git checkout develop; ```

``` git flow feature start add login page = git branch develop feature/add-login-page; git checkout feature/add-login-page; ```

``` git flow feature finish = git checkout develop; git merge develop feature/add-login-page; git branch -d feature/add-login-page; ```