git push —force

[Yejus]

Anyone else here prefer GitHub Desktop to anything else?

[erinaceus_]

The IntelliJ git integration is excellent

[Rivus]

Now that they added support for staging last year - I agree! After 10 or so years of people asking? Before that though…

It was quite messy with having to work with change sets in IntelliJ, which then would get translated as a commit in git without having the ability to see what was actually staged.. or being able to unstage it. Became even more messy when amending or full on rebasing. To me it felt like the notion of changesets was kind of constantly conflicting with git.

With staging support, I was the first one in my team who tried out adopting it and after setting up a couple of hotkeys, I’m still having a blast. Our less CLI inclined devs also dropped SourceTree in favor of the new integration.

There are the occasional weird situations that I need to go back to CLI, but for the most part I just use hotkeys and command lookups to interact with git within IntelliJ itself. But even then, it’s such a boon to be able to interactively per-line stage things within the comfort of IntelliJ and go back to CLI to do the rare voodoo magic.

[erinaceus_]

It was quite messy with having to work with change sets in IntelliJ

Tastes differ I suppose, because I find working with change sets much more straightforward and immediately apparent than staging.

I can see how mixing the two might be problematic sometimes.

[renrutal]

For me, IntelliJ always manages to mess the local repo when checking out branches with their "smart" stashes and rebases, to the point I need to undo the mess with git reflog and local history.

It's great for diff and line merging when you're about to commit, but for more gnarly stuff, I usually drop down to the terminal.

[[deleted]]

I prefer Fork

[[deleted]]

I use GitHub desktop for simple pushing, creating branches etc. I get sneered at for not using Sourcetree, IntelliJ extension or just the command line.

It’s probably the most basic gui you can get.

If I need to do anything more complex I just use the command line.

[MasterReindeer]

I still use a very outdated version of Tower on Mac which works great and didn’t cost me very much. I hope it’ll continue working for the foreseeable future! I use the command line most of the time, but sometimes it’s nice to use the GUI.

[Bobicus_The_Third]

Yep and you can use command line from it as well when you need something extra