|
|
Lol! Waymo would have a nervous breakdown if it encountered this traffic cop. 
|
|
|
|
|
Wordle 1,068 3/6
β¬β¬π©β¬π¨
π©π¨π©π¨β¬
π©π©π©π©π©
|
|
|
|
|
Wordle 1,068 4/6
π¨β¬β¬π¨β¬
β¬β¬π¨π¨β¬
π¨π¨π©β¬π©
π©π©π©π©π©
|
|
|
|
|
Wordle 1,068 3/6
β¬π¨π©π©π¨
β¬π¨π©π©π©
π©π©π©π©π©
|
|
|
|
|
Wordle 1,068 3/6
β¬π¨π©π¨π¨
π¨π¨π©β¬π©
π©π©π©π©π©
|
|
|
|
|
Wordle 1,068 3/6*
π¨β¬β¬β¬π¨
β¬π¨π©π©π©
π©π©π©π©π©
"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!
|
|
|
|
|
β¬β¬π©β¬π¨
β¬π¨π©π©π©
π©π©π©π©π©
In a closed society where everybody's guilty, the only crime is getting caught. In a world of thieves, the only final sin is stupidity. - Hunter S Thompson - RIP
|
|
|
|
|
Wordle 1,068 2/6*
β¬π¨π©π©π¨
π©π©π©π©π©
Happiness will never come to those who fail to appreciate what they already have. -Anon
And those who were seen dancing were thought to be insane by those who could not hear the music. -Frederick Nietzsche
|
|
|
|
|
Wordle 1,068 5/6
β¬β¬β¬β¬β¬
β¬β¬π¨β¬β¬
β¬π¨π©β¬β¬
π¨π¨π©β¬π©
π©π©π©π©π©
|
|
|
|
|
Wordle 1,068 5/6
π¨β¬β¬β¬β¬
π¨β¬π©β¬π¨
β¬π¨π©π¨π¨
β¬π¨π©π©π©
π©π©π©π©π©
Ok, I have had my coffee, so you can all come out now!
|
|
|
|
|
Wordle 1,068 2/6
β¬π¨π©β¬π©
π©π©π©π©π©
Jeremy Falcon
|
|
|
|
|
Wordle 1,068 5/6*
🟨🟨β¬β¬🟨
β¬β¬🟨🟨🟩
β¬🟨🟩β¬🟩
🟩🟩🟩β¬🟩
🟩🟩🟩🟩🟩
|
|
|
|
|
|
Judging by the amount of POO (programmation orientΓ©e objet) I see these days. 
|
|
|
|
|
You & Linus: The Gits.
"In testa che avete, Signor di Ceprano?"
-- Rigoletto
|
|
|
|
|
One of the reasons I'm such a prolific contributor here is I'm using the good people of codeproject.com
This site is an archive of my stuff, a portfolio, and documentation. I wonder if Chris feels used yet? 
To that end, I refer to my stuff when I'm mentoring other people on some reddit and discord spots I haunt.
It seems like I always have an article for the occasion that I can link to. "Oh here's how you do this." "You want to wrap that with *what* now? Okay. Here you go."
It's very convenient, but hard to keep up further inspiration for future contributions. I feel like a bit like The Simpsons - they already did it.
Check out my IoT graphics library here:
https://honeythecodewitch.com/gfx
And my IoT UI/User Experience library here:
https://honeythecodewitch.com/uix
|
|
|
|
|
Or just hope for the best or just re-write everything from scratch with the 2 versions on different screens for reference ?
I added a new feature in my developement branch as part of some bigger changes (database) , I needed to backport it to main branch, and I improved it on the main branch.
Now I have to merge it back to the development branch.
lolz... 
I just hope it compiles at this point and start fixing it !!
CI/CD = Continuous Impediment/Continuous Despair
|
|
|
|
|
I usually type the lines of code on Hollerith cards, then shuffle the deck like a tarot reader and hope for the best.
Will Rogers never met me.
|
|
|
|
|
Manually or auto: I can feel with you, I have always a bad feeling while merging branches 
|
|
|
|
|
Step 1. Take chicken.
Step 2. Sacrifice chicken.
Step 3. Attempt merge.
Step 4. Cook chicken. At least that might work because step 3 sure as hell won't have and, at least you'll have a good meal.
|
|
|
|
|
Pete O'Hanlon wrote: Step 2. Sacrifice chicken to Bubastis.
FTFY 
Freedom is the freedom to say that two plus two make four. If that is granted, all else follows.
-- 6079 Smith W.
|
|
|
|
|
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.
|
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
