|
Thank You for your Kind Informative reply. I must admit though ignorance re/ such things as code branches, merging, variant lines, stability lines, etc. As near as I can discern one attempts to somehow merge different versions of the same file into one file perhaps because different programmers altered it simultaneously presumably altering different parts or merge different groups of files into one group also for the same reason so I conclude the diff/merge utility is useful for projects w/ multiple developers. - Thank You again - Best - Cheerio
|
|
|
|
|
Not only different programmers at the same time (which will happen, especially for core files that offer shared functionalities) but in many situations.
1) Different variants for different customers (or platforms). This is standard operations on embedded devices because every OEM has different requirements in term of input data, diagnostic data, safety behavior... it's also common on multiplatform softwares for the various tweaks necessary to make it work.
What happens in this case is that you will have an evolving software base with new cross-platform or cross-customer functionalities and periodically you'd have to merge the current custom versions in the main development branch.
2) Stability lines. You deploy version 1 then start working on version 2. Customer with version 1 finds a bug, you branch from 1 and fix it for v 1.01. Now you have version 2 with the bug and version 1.01 with the fix so you'd want to port the bugfix from v 1.01 to v2. The contrary may happen: you find an unwanted behavior while working on version 2 and need or want to update the version 1 for the customers that are using it.
3) Different features developed at the same time / different approaches tested simultaneously. Say you need to filter an output, you create three branches with three different filtering approaches (e.g. moving average, moving median, straight average), build and test them and then merge the chosen approach in the main branch.
Once you get the hang of it using branches to organize work becomes second nature.
GCS/GE d--(d) s-/+ a C+++ U+++ P-- L+@ E-- W+++ N+ o+ K- w+++ O? M-- V? PS+ PE Y+ PGP t+ 5? X R+++ tv-- b+(+++) DI+++ D++ G e++ h--- r+++ y+++* Weapons extension: ma- k++ F+2 X
|
|
|
|
|
|
Git is a overkill and one better pay attention. I liked Windiff, but, yes, path names a problem.
|
|
|
|
|
Wordle 297 4/6
⬛⬛⬛⬛⬛
⬛🟨🟨⬛⬛
⬛🟩🟨🟨⬛
🟩🟩🟩🟩🟩
|
|
|
|
|
Wordle 297 3/6
⬜🟩🟨🟩🟨 a very successful starter
⬜🟩🟨🟩🟩 no need for a second starter
🟩🟩🟩🟩🟩 we do have some of those!
Luc Pattyn [My Articles]
The Windows 11 "taskbar" is disgusting. It should be at the left of the screen, with real icons, with text, progress, etc. They downgraded my developer PC to a bloody iPhone.
|
|
|
|
|
Wordle 297 5/6*
⬜⬜🟨⬜⬜
⬜🟨⬜🟨🟨
⬜🟨🟨🟩⬜
⬜🟩🟨🟩🟩
🟩🟩🟩🟩🟩
Happiness will never come to those who fail to appreciate what they already have. -Anon
|
|
|
|
|
Wordle 297 4/6
🟨⬜⬜⬜⬜
⬜🟩🟨⬜⬜
⬜⬜🟨⬜🟨
🟩🟩🟩🟩🟩
My regular 3 starters turned it into a simple anagram.
Software rusts. Simon Stephenson, ca 1994. So does this signature. me, 2012
|
|
|
|
|
Wordle 297 6/6
🟨⬜⬜⬜⬜
⬜🟨⬜🟨⬜
⬜🟩⬜🟩🟩
⬜🟩⬜🟩🟩
⬜🟩🟨🟩🟩
🟩🟩🟩🟩🟩
Just managed to solve it.
|
|
|
|
|
Three today!
Wordle 297 3/6
🟩🟨⬜⬜⬜
🟩🟩⬜🟩⬜
🟩🟩🟩🟩🟩 I would have got it in two, but I went for a more common letter set.
"I have no idea what I did, but I'm taking full credit for it." - ThisOldTony
"Common sense is so rare these days, it should be classified as a super power" - Random T-shirt
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
I suspect my 3rd try is the same as your 2nd - i.e. the more common letters:
Wordle 297 4/6
🟧🟦⬜⬜⬜
🟧🟧🟦⬜⬜
🟧🟧⬜🟧⬜
🟧🟧🟧🟧🟧
|
|
|
|
|
Wordle 297 4/6
🟩⬜⬜⬜⬜
🟨🟨⬜⬜⬜
⬜⬜🟨⬜🟨
🟩🟩🟩🟩🟩
|
|
|
|
|
Bow down to the king!
Wordle 297 3/6*
⬛⬛⬛🟩🟩
⬛🟩🟩🟩🟩
🟩🟩🟩🟩🟩
"It is easy to decipher extraterrestrial signals after deciphering Javascript and VB6 themselves.", ISanti[ ^]
|
|
|
|
|
3/6
⬛🟨🟨🟨🟨
⬛🟨🟨🟩🟨
🟩🟩🟩🟩🟩
GCS/GE d--(d) s-/+ a C+++ U+++ P-- L+@ E-- W+++ N+ o+ K- w+++ O? M-- V? PS+ PE Y+ PGP t+ 5? X R+++ tv-- b+(+++) DI+++ D++ G e++ h--- r+++ y+++* Weapons extension: ma- k++ F+2 X
|
|
|
|
|
Wordle 297 4/6
⬜🟨🟨⬜🟨
🟨🟨🟨⬜⬜
⬜🟨🟨🟩🟨
🟩🟩🟩🟩🟩
|
|
|
|
|
|
Very cool. Best of luck with it.
"They have a consciousness, they have a life, they have a soul! Damn you! Let the rabbits wear glasses! Save our brothers! Can I get an amen?"
|
|
|
|
|
... and over in the walled orchard?
Software rusts. Simon Stephenson, ca 1994. So does this signature. me, 2012
|
|
|
|
|
Microsoft & Linux stores are free to deploy to & I’m very cheap so Apple will have to wait.
I’ve actually paid the $99 yearly fee a couple of times in the past then totally wasted it by not deploying.
|
|
|
|
|
I have had it with Frontier Communications the only ISP provider where I live.
I have looked at a number of YouTube reviews some answer my concerns.
A few concerns I have deal with my Windows 7 64 bit NO WiFi it is hard wired.
Next deals with the location of my house Trees and Snow.
On a bad day at 7000 ft we can get 3 to 5 inches of snow YES I know the bevel has a heater
As for the trees at the least TEN 40 to 50 ft ponderous pine on my property 1/3 acre.
And the surrounding area here have a look 5462 Live Oak Drive Lakeside, Arizona.
As of today I do not have a ladder to get on the roof and use the app from StarLink.
Suggestions for a Modem to deal with the hard wired issue would be nice.
As for the Trees and Snow any one have experience or suggestions.
I have considered a 50 ft Old School TV antenna.If you can still buy them ha ha?
|
|
|
|
|
Very interesting challenges. Good luck to you with sorting that.
I wish I had some ideas for you.
|
|
|
|
|
Thanks for the moral support
|
|
|
|
|
I have StarLink for my connection and I really, really like it. Latency is almost always around 50mS so it is not like any other satellite-based ISP and I have had a couple of them. The biggest issue I had to deal with was getting a clear line of site to the path of the satellites. I find that my antenna almost always aims itself to the east (for reference, I am in northern California, about 100 miles south of the OR/CA border) so you need to have a clear horizon in that general direction. I have a lot of trees too but it us clear enough for StarLink to work. The antenna is aligned at a steep angle so it is aiming itself above the trees. Thankfully they are far enough away to not be too obstructive.
I have a lot hard-wired connections to deal with too so I got a wi-fi repeater with a LAN port. It is far from optimal but it works reasonably well.
"They have a consciousness, they have a life, they have a soul! Damn you! Let the rabbits wear glasses! Save our brothers! Can I get an amen?"
|
|
|
|
|
Having lived in Klamath Falls I would say that puts you in Redding.
So does a Wi-Fi repeater work for my hard wired computer?
So Starlink router attachment to the wi-fi with the LAN port then a line to the computer.
Snow I take it is not an issue I never drove south of Klamath Falls in the winter Siskiyou Pass
always was unnerving even with 4 by 4 Thanks for the info greatly appreciated.
|
|
|
|
|
My best friend lives on a mountain in northern CO. Snow is a thing. Trees aplenty. She loves her StarLink. Loves it. She has not been able to do anything to even slow it down - streaming on multiple source? No problem.
|
|
|
|