branchy | Execute a Node.js function in a separate process | Runtime Evironment library

You can use git for-each-ref and benefit from its formatting options, like this

You're better to think branches as heads (or pointers). What git log shows you is a DAG of the commits and a list of heads pointing to particular commits. What you can see at the current moment is something like: the php7 head is pointing to this commit. You cannot know in the past how the php7 head was moving since git allows us to move heads in a free manner.

Regarding git branch --merged [], look into its document, the command simply shows all the heads that can be reached from the . In your case, the is HEAD which means master. So the result is obvious: dashboard, master, and php7 are reachable from HEAD. Notice that by default git branch does not show remote heads, add -a option for that.

Now I think your questions could be answered.

Commits I remember doing on the php7 branch are all on the same orange line as master. If I merged and then deleted the branch (logical), why is it still listed as a branch at all?

Because it is not sure that in the past php7 was merged into master. Even if it was, it could be always that at some point later the php7 head was moved, so we cannot see the vestige of the merge caused by php7.

Why is there an extra "origin" label on the last of the php7 branch? I would think recent pushes would cause remote to look just like local, with only one "origin" label on the latest commit. Surely remote doesn't consider php7 to be not-yet-merged - that would be horrible, as that code is critical.

That label simply means that currently there are 2 heads -- php7 and origin/php7 -- pointing to that commit.

dashboard is not known by remote at all (https://github.com/OsakaWebbie/kizunadb) - how could that be?

Because dashboard was created locally and has never been pushed to remote.

I would be happy to delete it (I don't keep old branches for nostalgia), but git branch -d texlabels says: error: branch 'texlabels' not found. The most branchy-looking thing in the log isn't a branch? My head hurts.

You know the existing of the texlabels head just because you see its name in the commit message. But actually that head was deleted in the past thus at the moment you cannot delete it again.

To answer some more concerns of @OsakaWebbie

The --merged option is named based on the fact that, in normal development (i.e., you don't abnormally move heads, with git reset for example), if a head child can reach to a head parent, it means that parent was merged into child at some point in the past. In other words, child does inherit parent.

The second message you're quoting (Please commit your changes or stash them before you switch branches.) occurs when moving your pending changes would create conflicts on the to-be-checked-out branch.

When no conflicts are detected, the working tree is first updated regarding the commit HEAD is now pointing to, then your pending changes are replayed above and you're ready to add more changes or commit right away.

And as a sidenote, it's widely considered a good practice to always return to a clean state before checking another branch out. Committing on the branch* or stashing changes are probably the most common ways to achieve this.

(* since this commit is only local for now, you'll have the opportunity to amend it or drop it entirely when you'll return to this branch.)

Looks like there are a few issues against IntelliJ related to this confusion:

• https://youtrack.jetbrains.com/issue/IDEA-159138#tab=Linked%20Issues

You could upvote those and - for some near term mitigation - perhaps you could name your projects such that the additional context you want ("ah, it's projectX in branchY" or "ah, thats the projectX's trunk") is present in the project name?

The goal being to enable you to choose correctly from File > Open Recent > {choose one of the recent projects} and you wouldn't need to fall back to File > Open Recent > Manage Projects....

You can rename a project from the File > Project Structure dialog ... as long as it is a folder-based project (.idea) rather than file based Project (.iws).

Just looking at your code the obvious problem is that N might contain both branchX and branchY. In that case (it seems to me) you want to pursue both possibilities, but you're pursuing only the first.

Update

Another observation is that you probably want to pursue a branch if N contains the branch or its reverse. One of your operations reverses the string, and this operation might be applied an odd number of times for all you know.