|
I believe so... I try to avoid that.
Charlie Gilley
“They who can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety.” BF, 1759
Has never been more appropriate.
|
|
|
|
|
I use WinMerge for single files. Used to be much better before someone got the idea that when a directory on one side was empty that one should (must) show all the files on the other side.
So now I also use BeyondCompare. Just need to figure out all of the rules to add every time I must install it fresh.
And then I make sure I am very, very focused on figuring out the updates.
|
|
|
|
|
BC is legendary in my book. It even will show you what changed in images.
now, if they could lock down comparing Excel files, I would die and go to heaven.
Charlie Gilley
“They who can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety.” BF, 1759
Has never been more appropriate.
|
|
|
|
|
charlieg wrote: now, if they could lock down comparing Excel files, I would die and go to heaven.
Since Excel files are containers for multiple files, this would be like comparing two folders with added complications. In addition to there being multiple worksheets containing either grids or charts (and also charts on the grids), there's also highlighting, conditional rules, VBA macros, etc..
And that's before you consider how to actually display the difference between 2 versions of a worksheet, assuming they can be matched up when columns and rows may have been moved around, the worksheets have been renamed and moved into a different order...
Checking if the value of one cell has changed or is now a formula or an inserted image is barely the beginning!
|
|
|
|
|
lol, I didn't say it would be easy. I get the difficulty. I could live with just textual changes.
Charlie Gilley
“They who can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety.” BF, 1759
Has never been more appropriate.
|
|
|
|
|
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
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
