mastodon.bida.im is part of the decentralized social network powered by Mastodon.
Un'istanza mastodon antifascista. autogestita, italofona con base a Bologna. Rispettosa di privacy e anonimato.

Server stats:

901
active users

Learn more

#git

24 posts23 participants0 posts today

me: Hi #git, please just take the stuff I changed and put it on the webernet.

Git: Some updates were rejected because you have un-sprongled verterbrae in your sub-spline. Either extrapolate your tips or re-fling your local branch, using git reblog --ff-no-ice. If you want to recapitulate your local flange, then your diversionary remote can't be submitted without stripping the exoplanet, with potential universal anguish.
hint: Disable this message with "git config set advice.flagelate false"

More on #git
Your push can be rejected
since you might be working with
a bot/ person . action .. ( --force-with-lease)
on the same page at the same time or the same remote path and same branch or any such possibility ( unlikely but possible)

then your can
- see the diff bw remote & your local with
git remote branch:branch
or
git diff @{upstream-of-the-remote}

-- Basically when a tool has a feature in all cases for a purpose, you need know howto for any ambiguity which could arise out any sequence of those possible case.
There s no way to have it in advance
and hence a good or bad dev #UX or #repl are so important
eg --porcelain disables the summary's "helpful" habit of simplifying refs/heads in ways that make them ambiguous if you've made a mistake in your config.

Fedi, is there a way to view which version of git a particular Forgejo server is running, assuming I am an ordinary user and not an admin? api/v1/version shows the Forgejo version, but not the git version.

This is mainly for my curiosity and not for a practical purpose.

#git #Forgejo

Help me understand why #jujutsu #jj is worth using.

I am pretty happy using #git as is. My workflows are generally pretty simple, branch, commit, PR, squash, and merge.

My biggest pain points are when, rarely, a coworker will branch my branch and then I will have to handle the merge after I've rebased -i my branch.

I don't have any issues with git concepts or mental model. I rebase -i a lot, but rarely use the reflog. Only once did I lose any real work.

Re-post for visibility #git #vcs

For some reason, this morning is the day I've (finally) decided to take some time to actually learn #git in a more systematic way than my current approach of googling as I go along and inevitably forgetting how I solved the last problem... 🙈

I enjoyed reading and answering the quiz questions of the W3 schools tutorial (w3schools.com/git/) and I'm grateful to the #Stackoverflow peeps who have asked the same silly questions that I've been asking myself and to the kind people who patiently answered them. Now I know that "origin" doesn't have a particular meaning, it's just an alias for a URL and that there is a system to the use of one or two dashes in git commands (okay, I could have admittedly worked that one out by myself but trial-and-error served me just fine for the past few years... 🙃).

www.w3schools.comW3Schools.comW3Schools offers free online tutorials, references and exercises in all the major languages of the web. Covering popular subjects like HTML, CSS, JavaScript, Python, SQL, Java, and many, many more.

Linus Torvalds said that #Git has “never been a big thing” for him.

Well, of course he’d say that! What else could you expect from the guy who also said that #Linux was “just a hobby” and wouldn’t be ”big and professional”? 😁

DEVCLASS · 20 years of Git: 'Never a big thing for me,' says inventor Linus Torvalds  • DEVCLASSGit, the dominant version control system for code, is 20 years old this month, but inventor Linus Torvalds […]

Un Linus Torvalds visibilmente più "senior" ci confessa che "Git è più popolare di Linux", nonostante sia stato pensato come un tool secondario, per agevolare lo sviluppo del kernel.

Un altro aspetto interessante è quanto sia avvenuto velocemente il cambio di maintainer.
Prima o poi anche il kernel Linux dovrà allontanarsi dal suo creatore; il passaggio sarà altrettanto indolore?

news.itsfoss.com/torvalds-on-g

It's FOSS News · Git is More Popular than Linux: TorvaldsLinus Torvalds reflects on 20 years of Git.