alenmilk
Joined 12 years ago
Joined 12 years ago
At the end of the article: This is a clearly ambiguous merge and it simply wouldn’t be right for your version control system to try "resolving" it for you.
So the strategy is that if there is any doubt you have to manually fix conflicts. This is by design.
The Online Etymology Dictionary states that the use of the term to mean "'calculating machine' (of any type) is from 1897.
The Online Etymology Dictionary indicates that the "modern use" of the term, to mean 'programmable digital electronic computer' dates from "1945 under this name
So computer is the correct term before 1945.
Found this quote that sums it up nicely.
How can a computer be non-programmable? The whole idea of a computer is that it runs a list of instructions.
This is the issue. While the subscription model may be the right choice forward it may also be the catalyst of a collapse (like the dotcom bust) if the users get bullied enough.