I’ve been jumping around from Spacemacs, Prelude, IntelliJ and finally I realized how much time do we really waste in search for “optimal environment” when that sense of satisfaction after hours of “tweaking" lasts only awhile… Perhaps it’s not the case for everyone, but however, unfortunately I’m not alone in this boat.

disabling linum-relative made my setup a lot snappier

@chokheli: I found that learning one editor that is customizable, open source and cross-plattform and really mastering it, goes a long way. Especially if the editor promotes an editing style that makes you faster over time. I have to work on a Mac, on Windows and Linux and sometime on a BSD machine so the versatility of my environment is key for me. That's why I was working in vim and tmux for a while until I discovered org-mode and needed to switch to emacs. Since I fell in love with vims modal editing the jump to evil-mode and subsequently Spacemacs was inevitable. This is where I landed and I couldn't care less about IDEs or the new hot editor on the block like Atom or VS Code. With Spacemacs I can start coding in my preferred environment within minutes and I don't have to ask the sysadmin to install some big piece of software. Sure, I fire up IntelliJ when working on a Java project but with everything else I'm golden. I like Spacemace because it has sensible defaults and I found it a good practice to learn those instead of reconfiguring everything. I suggest to learn one thing and stick with it. I understand (and did it myself) that it takes a while to land on an editor you are satisfied with but one has to stop looking for the next hot thing at some point. 🙂

Any magit users here?

I'm somewhat used to it. Easily do stuff like commit, amend commit, push commit, fetch, rebase, fix merge conflicts.

But I just had a very particular and weird situation. I had fetched from origin, and my local commit had a change in file x on line y, and so did a commit coming from origin.

I pressed F to pull, and got a merge conflict. Fixed the conflict, then wanted to stage file x so that I could create a merge commit.

But when I staged x by pressing s with the pointer on it, it just disappeared from the magit status window!

It did say that I was doing a merge, however, but I couldn't figure out how to "end" the merge....

I tried starting a commit with c, but emacs replied that nothing was staged.

Very strange, that is not an odd workflow at all, I use magit to do that all the time.

does the command line git status give you the expected output?

@jstew in the end I fixed it on the command line. Git status said

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   ../x.file

So I added the file, committed (with the usual pre-filled merge commit message by git), and was done.

It was extremely frustrating not being able to do a simple thing in magit... A thing which I assume thousands of people do every day.

Yes, it's something I've done without issue hundreds of times in magit.

So you just stage the resolved file by pressing s with the point on the file, then press c to commit?

(And after you press s, the file appears in the "Stages Files" section?)

yes, exactly!

I'll assume that I hit some very weird corner case, then...

That scenario should be fairly easy to reproduce if you wish to.

I'll consider it, depending on my work tasks for the remainder of the day 🙂

Or maybe it'll pop up by itself.

x)

@chokheli I jump around between Atom and Spacemacs. Atom has a lot of modern features I like and some great defaults, but lacks maturity and speed, and many plugins and design-decisions seem immature or not thought-out. On the other hand, Spacemacs, though much, much more friendly than plain emacs, still misses the mark for some things that should be simple to find and have been common in GUI editors for 15 or 20 years. I end up spending time figuring out Spacemacs instead of getting my work done.