If you are going to do closed source, at least do it like this.

Basically the opposite of need to know for software.

git rebase does not tell you that, and that sucks.

We only know which commit from the feature branch caused the problem.

Generally we can guess or it is not needed, but imerge does look promising: stackoverflow.com/questions/18162930/how-can-i-find-out-which-git-commits-cause-conflicts

For the newbs.

Slick? No. But gitk does the job, like any one of the other 100 billion free Git UI viewers out there

gitk master HEAD

Many IDEs are also implementing this now (e.g. VS Code, Eclipse. Most free IDE GIt implementations are still crap, but that is the future, because you want to edit, view history, edit, view history, commit, edit.

These people are heroes. There's nothing else to say.

A language that allows you to talk to and command a computer.

There is only space for two languages at most in the world: the compiled one, and the interpreted one.

For 2020 now, when you have a choice, you must go for:

Those two are languages not by any means perfect from a language design point of view, and there are likely already better alternatives, they are only chosen due to a pragmatic tradeoff between ecosystem and familiarity.

Ciro predicts that Python will become like Fortran in the future: a legacy hated by most who have moved to JavaScript long ago (which is slightly inferior, but too similar, and with too much web dominance to be replaced), but with too much dominance in certain applications like machine learning to be worth replacing, like Fortran dominates certain HPC applications. We'll see. Maybe non performance critical scripting languages are easier to replace.

C++ however is decent, and is evolving in very good directions in the 2010's, and will remain relevant in the foreseeable future.

Bash can also be used when you're lazy. But if the project goes on, you will sooner or later regret that choice.

The language syntax in itself does not matter. All that matters is how many useful libraries and tooling it has.

This is how other languages compare:

Ciro Santilli thinks imperative programming is just a superset of functional programming where you can have state.

C and C++: OK, you're old before the Internet and compiled, forgiven.

Python: OMG, please, just make it work!!! Your are interpreted!!! You are a hot web technology!!! Node.js and Ruby are doing just fine, and Ruby is not newer than you!!! See also: pip.