- 11 Posts
- 709 Comments
itsathursday@lemmy.worldto
Ask Lemmy@lemmy.world•How quick are you to block someone on Lemmy?
3·6 days ago43 users and 975 communities
itsathursday@lemmy.worldto
Ask Lemmy@lemmy.world•How quick are you to block someone on Lemmy?
11·6 days agoIsn’t that the point of cross posting in the first place, to share a cross multiple communities?
itsathursday@lemmy.worldto
Formula 1@lemmy.world•Gianpiero Lambiase to join McLaren in 2028
7·8 days agoOr he knows Max is no longer in the picture and wants to be with a winning constructor and driver lineup.
itsathursday@lemmy.worldto
Ask Lemmy@lemmy.world•Where can i find a good video tutorial on shaving my junk?
2·9 days agoIt’s to warm your skin as is easier to get a closer shave with less effort and you won’t be trying to shave the same area multiple times which irritates the skin and increases the chance of cutting it. Also shrink factor is eliminated allowing you to stretch a smoother canvas to work with.
itsathursday@lemmy.worldto
Technology@lemmy.world•Anthropic says its latest AI model is too powerful for public release and that it broke containment during testingEnglish
28·9 days ago“Hold me back bro! Don’t let me go otherwise there’s no stopping what I could do, I am serious!”
itsathursday@lemmy.worldto
Ask Lemmy@lemmy.world•Where can i find a good video tutorial on shaving my junk?
3·9 days agoHot water / hot towel soaked in hot water helps
itsathursday@lemmy.worldto
Technology@lemmy.world•AI Company Clones Musician’s Voice, Then Copyright-Strikes Her Own SongsEnglish
20·10 days agoThe system is working as intended
itsathursday@lemmy.worldto
NonCredibleDiplomacy@sh.itjust.works•The modern BismarckEnglish
4·11 days agoArt of the inshallah
itsathursday@lemmy.worldto
Web Development@programming.dev•CSS sucks because we don't bother learning it.
2·12 days agoJust web dev things…
itsathursday@lemmy.worldto
Learn Programming@programming.dev•Where can I find documentations on how to resolve a git conflict properly?
1·12 days agoCheck out the Atlassian docs for any git related topics or commands as they are usually easier to make sense of with example situations and explanations beyond describing just the feature or functionality.
itsathursday@lemmy.worldto
Learn Programming@programming.dev•Where can I find documentations on how to resolve a git conflict properly?
1·12 days agoSecond this.
https://www.atlassian.com/git/tutorials/merging-vs-rebasing
You should also set it in your got config to pull.rebase true to avoid fast forwarding and other issues without being aware of how changes on main actually affect your branch changes and resolving them yourself so that your changes make actual sense when going into main.
itsathursday@lemmy.worldto
Learn Programming@programming.dev•Where can I find documentations on how to resolve a git conflict properly?
4·12 days agoSince no one is answering directly, here’s the steps to follow and you can go from here to find the specific commands. If you want to get back to a specific point in the history of the remote repo as a means to undo a mistake, and then continue from that point with any changes then usually you want to do this in a non-destructive way. ie. accept you screwed up and don’t cover it up.
There are many ways but this is the way that works.
- Keep a second copy of the local repo with the current state and changes you’ve made. If you screw up git commands this is your physical reset and save point for the repo history log and changes you made.
- Find the commit in git log you want to go back to and save that commit hash.
- Git checkout that commit in you local. You are now in the point at the past before it all went to shit.
- git diff the files that you want to apply changes with the ones in the copied repo and create a patch file. There are many ways to solve this, but this way you have a physical record of the changes, seperate from the git repo and you can do with them what you like. Include read and view them yourself.
- git checkout to main again on latest commit/head
- use git revert to utilise the built in undo convenience this provides by taking the state of the local repo to the commit hash in the past and committing changes to make this possible on top of the current state to make it the same but without erasing the history that you screwed up. All changes are additive even the ones to remove changes.
- now git push (without the force since you are not a jedi by any means and this is a humbling moment on this path to become one)
- now create a new branch for the changes you originally intended to make and pretend you haven’t wasted this time and are actually net positive because of the learning experience
- apply the patch files to the files you want to change and hope they apply, if not, manually resolve any merge conflicts by hand
- commit the changes to the local branch
- push the branch to remote
- do a pull request and summarise what all the changes are in the branch
- merge the changes into main branch and squash the commits
- realise that your original method is really no different as to the result, just now you have some more fancy ways to achieve it
itsathursday@lemmy.worldto
Fediverse@lemmy.world•What’s the Facebook clone in the fediverse?English
8·17 days agoThere isn’t one, there are many.
Go to https://fediverse.party/en/miscellaneous/ select Social network (macro) to see the full list.
I haven’t used any so can’t recommend one in particular.
Not really sure what you are getting at but AUD cross rate against the GBP, USD, EUR will explain why they are better numbers against the countries you do show the AUD against. You can’t have AUD performing better compared to them unless it is actually calculated at a better rate of forex. Have a read of why historically we have been expected to be behind them and then where it’s at now https://www.rba.gov.au/publications/bulletin/2018/dec/understanding-exchange-rates-and-why-they-are-important.html#box-a there are other good articles on the RBA site too.
Essentially though average wages are higher in AUS so we get more bananas to spend, but in the UK and US they get less bananas but they are bigger.
Definitely looks like the kind of handy work someone with that truck would do in these trying times. At least you know what you are getting if they pull up and try give you a quote.
itsathursday@lemmy.worldOPto
Showerthoughts@lemmy.world•The amount of shower thoughts you have increases with the fewer number of baths you take
3·17 days agoThe amount of babies saved is also incredible. Both on the front of not throwing out the bath water and then on the side of purchasing said water.
itsathursday@lemmy.worldOPto
Showerthoughts@lemmy.world•The amount of shower thoughts you have increases with the fewer number of baths you take
2·17 days agoThanks team, we did it. Brain no good with the thoughts of thoughts, but the record of such has been great success.












Touching grass or as the kids say, overdosing on tokenmaxing