|
An ounce of prevention is worth a pound of cure. You'll get less merge conflicts (it won't be perfect, just less) with strict formatting rules for the project. But, if it's already out of whack and the mergyness needs to happen...
(Speaking git lingo but it should be transferable)
Assuming it's a large merge....
- If it's not hundreds of commits and the devs actually made smaller commits, use rebase. It'll take a bit to go through all the commits but you can take it in bite sized chunks which may be mentally easier.
- If it's hundreds of commits then, first make sure you diff tool can ignore whitespace. Something like Beyond Compare will do that. Second, run all your linters and code formatters on both the target and the destination branches before attempting the merge. And lastly, for the love of all things pure do a 3-way merge to help give you context.
Jeremy Falcon
|
|
|
|
|
If you are comparing code - I strongly STRONGLY recommend Beyond Compare. My coworker, mentor, boss sent me in this direction, and I never looked back.
As far as the general process - full disclaimer I use SVN and Tortoise, so I cannot speak to what GIT does - doing a large merge should be off in a branch. Once you are done and happy, you can migrate it to the trunk. Using this approach, you have a retreat path. Feel free to do as many commits as you want on the branch to show your merge work. Better yet, have developer 1 and 2 commit their work on separate branches and merge those. Protect the trunk.
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.
|
|
|
|
|
|
Jeremy Falcon wrote: the people of this place aren't mature and rational.
Developers mature and rational? You must be from the alternate timeline! 
Freedom is the freedom to say that two plus two make four. If that is granted, all else follows.
-- 6079 Smith W.
|
|
|
|
|
|
Daniel Pfeffer wrote: Developers mature and rational? You must be from the alternate timeline dimension!
FTFY
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 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!
|
|
|
|
|
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.)
|
|
|
|
|
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. 🤔😉
|
|
|
|
|
|
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
|
|
|
|
|
I am thinking about using a static code analysis to identify security vulnerabilities as I and my team write code. (Like Sonar lint but for security).
I have come across some extentions like
Security code scan[^] or Synk Security[^].
Do you have any experience with such extensions?
If yes do you think they are useful?
Do you have other recommendations?
|
|
|
|
|
You do know that Sonar can help identify security vulnerabilities don't you? If you're using Visual Studio, you can also use security analyzers to help detect OWASP errors. To be honest, and I speak with a lot of experience in this area, SAST can be more dangerous because it gives you a false sense of safety. All SAST tells you is that the code you checked in doesn't have a vulnerability. It's not that great at determining that a dependency of a dependency of a dependency has a known vulnerability, or that you have an unpatched container or OS vulnerability. You need to consider security as a top to bottom thing, so you would be looking to leverage SAST, DAST (the dynamic version of SAST), IAST (the infrastructure version), and so on.
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
