|
StarNamer@work wrote: how to actually display the difference between 2 versions of a worksheet
So maybe a real use for 3d headsets?
|
|
|
|
|
Was there not an export or save command for the rules?
M.D.V.
If something has a solution... Why do we have to worry about?. If it has no solution... For what reason do we have to worry about?
Help me to understand what I'm saying, and I'll explain it better to you
Rating helpful answers is nice, but saying thanks can be even nicer.
|
|
|
|
|
I use git rebase master to put the branch's changes on top of the current version of master. You'll have to resolve conflicts just like with git merge .
After you're finished, then use git push --force-with-lease to push your changes to your remote branch. (You might need to ask the repo administrator to grant you this permission, or push these changes to a new remote branch if that is not possible. The reason the permission might be denied is that force pushes rewrite history, so if two people are working on the same branch it can cause problems.)
|
|
|
|
|
One advanced technique -- maybe overkill for your scenario but sometimes necessary.. I had to do this recently -- use a tool like Araxis Merge to do a three-way diff/merge (compare 2 branches against a common ancestor).
1- use `git merge-base BranchA BranchB` to find common ancestor .. create a new branch BranchC off that commit
2- clone/checkout BranchA and BranchB in separate subdirectories
3- launch a three-way merge: A(left), C(center), B(right) .. manually merge stuff to BranchC
4- commit BranchC .. then merge those changes back up to BranchA and BranchB
this will lose some commit-history from incremental changes in BranchA and BranchB.. vs cherry-picking from A to B then merging back to A
but if those branches were messy and conflicting, then that commit-history might have been unintelligible anyway
|
|
|
|
|
The best technique I have found is what I do before I have to merge.
I create my working branch from whatever “main” branch is “gold”.
Every morning, I merge that main branch into my working branch to pick up any changes others pushed up. At worst, there is an occasional small manual merge affecting a line or two.
Then, when I create my pull request to merge my working branch into that main branch, I don’t have merge conflicts.
A little preventive medicine goes a long way.
|
|
|
|
|
I saw a low-flying helicopter over a local strip mall and captured this video.
Low-flying Helicopter Over Strip Mall - YouTube[^]
That's the big excitement this week, folks.
NOTE: Turn on sounds for chopper sounds and commentary.
The chopper really was quite close.
|
|
|
|
|
Helicopters? I did not know Ohio had such technology.
|
|
|
|
|
Looks like a Robinson (R44?) descending to land. Is there an open space where it was headed, sports field, etc?
As well as sometimes working with firefighting helis, I see and hear enough of them to be able to identify most by sound alone.
Yesterday, from memory, a couple of military Blackhawks, an AW-139, a Huey (or Bell 2xx derivative, didn't get a visual) and an AS-350 Squirrel.
Software rusts. Simon Stephenson, ca 1994. So does this signature. me, 2012
|
|
|
|
|
Very cool that you know about helicopters. The only thing I have heard about them is that they are very difficult to fly.
I'm not sure where that helicopter landed. It was quite stunning to see it so low and then descending like that. I believe they are clearing a field behind that strip mall though so maybe that was it.
I will take a drive over there tomorrow and look behind the strip mall and see if I can tell where they might've landed. I'm just so confused about it.
|
|
|
|
|
raddevus wrote: saw a low-flying helicopter over a local strip mall
Peter_in_2780 wrote: Is there an open space where it was headed, sports field, etc?
Mall parking?
|
|
|
|
|
I wonder if they actually had all of the permissions for that landing.
|
|
|
|
|
jschell wrote: I wonder if they actually had all of the permissions for that landing.
I'm so glad you said that. I thought the same thing. Before I started recording the action, the chopper had circled the parking lot at a very low altitude (low enough that I was comparing it to the lamp-posts). When it finally hovered above the Kroger I decided to record it because it was so odd.
I'm usually too lazy to even turn the phone on and point it.
Anyways, I thought they were flying way too low in the area and wondered if it was legal too.
|
|
|
|
|
Flying very low just before you touch down is pretty much mandatory. I'd like to see a regulation that prohibited low flying before a landing. 🤔😉
|
|
|
|
|
raddevus wrote: When it finally hovered above the Kroger
That doesn't seem legal. If they were doing an air survey they would not have landed.
If there was a special event on a field then they should have come in higher.
|
|
|
|
|
Thanks for posting that. That is exactly what I was thinking. It was really all very odd.
|
|
|
|
|
|
I am surprised by how surprised you were
I am probably wasted, living in a big town (by Norwegian standards). All the major hospitals in Norway have rescue helicopters, and they are used all the time. I wouldn't be surprised if there are more victims of accidents brought to the hospital by helicopter than by ambulance. One good reason for that is that we have countless inhabited islands along our coast with neither ferry nor bridge to the mainland. We have vast inland areas with no roads for an ambulance to drive (yet with lots of activity, like forestry, hunting, hiking, ...). There are accidents aboard ships, fishing vessels and smaller boats.
Even for road accidents, helicopters are frequently used for patient transportation, to avoid traffic jams. They can go in a straight line to the hospital, and at much higher speed than an ambulance. They have a landing spot at the roof of the hospital.
So, seeing a helicopter over your head is almost as commonplace as seeing an airplane. If you see them landing in some random field, or a highway, or a flat rooftop, it catches about as much attention as the sound of an ambulance siren: Not very much.
Take a look at NORWEGIAN AIR AMBULANCE - BALANCING ON GUARD RAIL - YouTube[^] The rescue helicopter arriving at the site of a car accident finds no suitable landing spot, so it goes down on the guard rail, keeping the rotor spinning for balance.
The pilot became a nationally known hero after that landing. (The story is quite old, from 2013.)
Religious freedom is the freedom to say that two plus two make five.
|
|
|
|
|
I know what you mean - same in London, lots of choppers of various types, often see chinooks but the one time I was surprised was when I saw a Boeing Osprey flying along the Thames - that looked like something out of Quake II
|
|
|
|
|
There are several consumer-owned helicopters in my area. They fly them to/from work, other towns, sporting events, etc. Convenience, yes, but also a bit of "I have money and I'm going to show it" type of thing.
"One man's wage rise is another man's price increase." - Harold Wilson
"Fireproof doesn't mean the fire will never come. It means when the fire comes that you will be able to withstand it." - Michael Simmons
"You can easily judge the character of a man by how he treats those who can do nothing for him." - James D. Miles
|
|
|
|
|
Helicopter's are fascinating when I lived in the Grand Canyon National Park for 8 years I became friends with a number of helicopter pilots. One of the most fascinating pilots was the fellow who flew the rescue chopper for the Park Service. My two close friends that were former Vietnam Warrant Officers started a helicopter tour company. The fellow who flew for the Park Service was not a Park Service employee. And they both told me he was quite the legend as he flew diamonds in New Zealand. Seems he would on occasion encounter pirates that would try to bring his bird down. Because he lived outside the park the Park Service Paramedics complained he was not ready to go when they got to the heliport.
NOT TRUE he was always sitting in the bird rotors turning ready to go.
One day he had enough of the complaining. So the correct procedure to descend into the canyon is hover over the area to land and spiral down. Well he told the paramedics to hang
on. Trust me you do not do this! He got the bird over the canyon and rolled it in.
That ended the complaining!
Side note every Saturday I flew to Hualapai Reservation with my Warrant Officers friends who had a contract to fly the Hualapai in and out of the canyon with their grocery's
|
|
|
|
|
|
Quote: I love to hear about how people live and work. Very interesting.
Because you are in Ohio I Think
I can share some great stories about out of High School working at Diebold Lock & Safe
I drilled all the holes in the vault doors lock mechanism
Drill was guided by a computer that used a paper tape with holes to feed information to the drill NO electronic info like we know computers today.
If the paper broke life was not fun
|
|
|
|
|
Choroid wrote: If the paper broke life was not fun There were tape variants made from mylar, so strong that you could use surplus tape to wrap heavy goods onto you car trailer. The negative part is that it was so strong that most tape punchers wasn't able to punch it.
And there was the plastic coated aluminum variant, also extremely strong, but stiffer. When winding the tape back onto its spool, at high speed: Keep your fingers away from the running tape edge! It was sharper than a butcher's knife. Some people I met could tell about really bad cuts they had had before learning due respect for fast running tape.
Both of these two variants never broke. They were difficult to break deliberately even with tools.
Disclaimer: Last time I worked with punched tape (both paper, aluminum and mylar) was in the summer of 1978, but I still have a few lengths of the paper variant laying around, to show young people what it really looked like.
Religious freedom is the freedom to say that two plus two make five.
|
|
|
|
|
I was just a employee not involved in any decision making
But my uncle who worked in finance told me how we ended up with this drill press
The company suggested the Aluminum Tapes but the engineering guys did not like
automated tools so they recommended the paper tapes knowing they would fail and slow production
This was a highly controlled Union place of employment
When they asked me if I wanted to join the Union I said NO Thanks
I got a pink slip the next day, My uncle saved my job and they called me in the office
and asked "Why I refused to join the Union?"
I said he asked if I wanted to. Seems it was a right to work union shop.
Which meant you had to join the Union if you wanted to work there.
I don't remember but I think the drill press was Swiss Made.
Curious what machine were you running in 1978 with tape readers?
Thanks for sharing the info
|
|
|
|
|
Choroid wrote: Curious what machine were you running in 1978 with tape readers? If you have ever heard about them, I'd be very surprised
In the mid-1960s, the Norwegian Defense Research Establishment (NDRE, or FFI in Norwegian) developed several small computers for military purposes. I am not into military terminology and do not really understand how they were used, but apparently, they controlled weapons directly, e.g. Penguin rockets. Some people at NDRE got the idea that the SM-2 machine could be a model for a computer aimed at the civilian market. So they gave that task to Kongsberg Weapons Factory (KV). In 1970, KV brought SM-3 to market, a couple of years later the SM-4 (I am not sure about the difference between these; they were binary compatible) and in 1975 the KS-500, also binary compatible. The KS-500 had semiconductor RAM, while the SM machines used ferrite core.
These were machines in the 'PDP-11 class' - 16 bit, single 19" rack general machines. The SM-4 and KS-500 were the ones I was "working on" in 1978 - this was before I started my studies, in a summer job, so I was mostly a runner boy: I didn't develop software. One of my tasks was duplicating paper / mylar / aluminum tapes for shipping to customers - punched tape was the "floppy disk" of those days
The SM-4/KS-500 never made a hit in commercial markets by themselves, but KV produced some highly recognized pen drafting boards (typically of A0 or A -1 size, the biggest one was 2.6 by 3.7 meters) controlled by these machines. Also, they were used for computer controlled cutting torches and welding machines, considered very advanced technology in the early 1970s. There were some significant military uses as well. (In peaceful years, in spite of its company name, most of KV's production was civilian, but in a crisis, it could all be switched to military production within a couple of weeks, I was told. So it is not surprising that the military products made use of the SM-4 and KS-500.)
My supervisor in my summer job was rather military oriented, and could never accept the KS-500: Semiconductor memory is just a fad! Completely useless, when you take the computer out in the field, and it looses the contents of the program memory if the power is broken - noone can live with such unreliability! (I guess that a paper tape might useless in muddy trenches, but with the software on an aluminum tape you might be able to reload the memory as soon as power was restored The SM-3 could run on 24V and could take a shock of 50G!)
So, if you were into computer controlled drafting, steel cutting or welding in the 1970s, you might have hear about these machines. Otherwise, they are rather obscure.
Bonus chatter:
You might have heard of NORD-1 and NORD-10 computers, and then came ND-100. These were highly successful in the commercial marked. When NDRE wanted to commercialize SM-2, they let two different companies have a go at it: The old, established KV, and the newly established Norsk Data (ND). In theory, the SM-3 from KV and the NORD-1 from ND should be more or less identical, binary compatible. They were not, and the story behind that is why I mention Norsk Data:
KV was no doubt old and established, with classical work patterns. They do thorough planning, and write the documentation before starting to solder components onto the board. The technical writers didn't know much about computers, and made a few mistakes. For shift instructions, one bit in the instruction word indicated rotational shift, another bit was "don't care" - and the TW mixed them up, different from the SM-2. He also misinterpreted the role of the B register (Base, i.e. stack pointer) in the calculation of the physical address; the description didn't match that of SM-2. (The way the B register was documented made it almost useless!)
This was discovered before the assembly line was started, but after 500 copies of the reference manual had been delivered from the print shop. So KV had a choice: Throw away 500 copies of a thick reference manual (printing was expensive in 1970!), or build the machine as documented. They chose the second alternative.
At the same time, the ND people built their NORD-1 with the circular shift bit and the B register use like the SM-2 "template", but different from the SM-3. So the two machines were not able to run each others' software (as originally planned).
Bonus chatter #2 - on tape readers:
The historical corner in my tech. university had a 1961 vintage Danish GIER computer with an optical paper tape reader that would read 2000 characters/sec! A well known secret was the purpose of the yellow tape on the floor in front of the GIER, with another short strip of yellow tape across, a couple of meters to the side. The cross was were you should place the basket to collect the paper tape after it shot out of the reader at a speed of 200 in/sec!
Religious freedom is the freedom to say that two plus two make five.
|
|
|
|
|