#git checkout

[kaiserouo]

(prev | next | first)

whoops

[snarp]

I'm allowed to cause terrible problems

[kaiasky]

git branch -b should alias to git checkout -b. You knew what i meant, fucker

[devsnews]

This article is about "git switch", and "git restore" commands and their usage instead of `git checkout` command.

[aseplant]

This is more for prev, but I'll add on here in case it helps OP too.

Branching on Github is actually a lot like it sounds. Let's say we're originally on "main" (which is the branch most Github repositories start from*, and is generally considered the source of truth). We decide to branch off, and create a new branch called "my-branch". Main and my-branch will share the same history up until whatever point you decided to split at; after that, whatever work you commit to my-branch will not show up on main, and vice versa.

(*Older Github repositories started from "master" instead of "main". You'll still see this used in a lot of online guides.)

Branching is standard practice in most team settings because you don't want a lot of people editing the same files at a time. Some people push half-finished or buggy work to Github, and this can cause real messes for other people! So instead everyone isolates their own changes, and when they're pretty sure everything is working they merge their branch back into main, and it becomes a part of the new source of truth.

Github is actually pretty smart about merging. Let's say you edited lines 200-300 in a file, and while you were off on your own branch your coworker edited the same file on main. As long as they didn't touch lines 200-300, Github will assume your edits are the ones that should be preserved! (If they did touch lines 200-300, Github has no clear way of deciding who should win, and this is how we get merge conflicts. Usually a human has to go and tell Github which version to keep. Sometimes humans are stupid and tell Github the wrong thing.)

One final thing you might see people talk about is "rebasing", which is when you rewrite your history to match another branch's. Some people like this because it's cleaner. (Contrast this to merging, where both branches keep their histories.)

Can someone explain to me in like five seconds how to use git, assuming that I know basic shit about coding/command line/whatever but don't know any of the specific terminology related to git. Like every tutorial online is at the same time both over my head and also vastly too basic. Just like. Tell me what it is.

Uh. First tell me its ontology. Is it a program, a standard, a language...? I know that it's for version control. Suppose I wanted to do version control at a piece of code. What do I do. What buttons do I press, on my computer? Tell me these things.

[derinthescarletpescatarian]

There are a lot of valid criticisms to be made about AI art generators and large language models, both in terms of ethics and practicality, but some people out there are using the stupidest arguments I've ever seen and seem to be motivated primarily by a kneejerk "ai = bad so any coherent thought I can string together about that must be a valid argument" sort of reaction.

You look at posts about problems with AI art and it's like:

someone who sounds like my stepfather complaining that those newfangled automatic checkouts will put all the checkout chicks out of work and bring down society by putting them all on The Dole and turning them into bludgers instead of hard-working young ladies

someone who sounds like legislator in the early 2000's arguing that video games "aren't real art"

someone with a well-reasoned and cogent argument about copyright, the labour market, and the increasing ability of bots to make the world more terrible, and how AI is one new small part of that

someone who sounds like a teen arguing that making avatars in picrew is anti-art because it's depriving real artists of work and if you want a profile pic on some random forum then you should either Git Gud and draw it yourself from scratch or make money and pay someone else to do it

[ashhaven]

I know I don’t have a lot of programmers following me

But me and some friends a d colleagues just workshopped the git fucker 9000

git fetch && git checkout master && git branch —list -r | sort -R | xargs -L1 'git merge —strategy=ort —strategy-options=theirs -q —squash' && git reset $(git rev-list --max-parents=0 HEAD) --soft && git add -A && git commit --amend -m "lol, lmao even" && git branch --list | xargs -L1 'git branch -D' && git branch --list -r | xargs -L1 'git branch -D -r' && git push -u origin master -f

Do not run this

[goblin-enjoyer]

ah crabp have not drawn in a bit, trying to be more consistent so I get less skill falloff (i swear what is this, the high warlord grind? def need this to be patched) can't figure out what homestuck git to draw next (i am trying to draw all the homestuck gits, well most of em at least) and i keep coming up against a wall. (i can't think of which one to do next) so i make quicke poll (at probably too late a time for it to do anything, thus likely getting me nowhere in my stuckness. i mean i have a 8 ball specifically for this kind of thing so if push comes to shove i'll just use that) to make decisions easier and get juices flowing (parentheses)

there we go this should help me get an order and thought on things. thanks in advance to all who help out here and if you are wondering "hey what kinda art this git do?" then just checkout my art tag (or i guess homestuck tag if you want to see my descent to madness lolbk) I have been trying to do all the homestuck "main" characters with random other characters. been fun and useful in learning how to draw humanoids. that and homestuck characters are just fun to draw at times don't even need a parenthesis for that.

[shieldfoss]

Git checkout autocomplete

when i do git branch (tab) I get a list of two options - the main branch and the one I created on this machine.

when I do git switch (tab) I get my two locals, but also a couple of extra options that are on the remote.

So Far So GoodExpected.

But when I do git checkout (tab) I get a bunch of stuff I don' t recognize: "DIsplay all 265 possibilities? (y or n)"

what... are these extra branches? My best guess is "old branches that were merged, but that merge remains part of git history despite the branch being deleted" - does that sound right?

[abalidoth]

> git clone https://standard.gender/girl.git

> cd girl

> git checkout -b tesseract_gender

> rm pronouns/she.pn

> cp ~/they.pn pronouns/they.pn

> cp ~/ae.pn pronouns/ae.pn

> mkdir robot

> mkdir math

> mkdir other

> cd other

> echo "TODO: dragons????" > README.md

> cd ..

> echo "TODO: clean unwanted bloat out of /gender_roles, grep everything for 'woman' and get rid of it, figure out a way to stop the import errors when I use the beard module" >> README.md

> git add .

> git commit -m "Work in progress! Also, future Tessa: make this a fork and don't just leave it a branch forever like you KNOW we will."

[sevarix-blogs]

a few months ago my coworker was like "oh yeah you can use dash (-) to go back to your last branch" and it blew my mind

git checkout -

changed my life 😭

[technicallywrite]

Progress update on Cosmosgate

I had promised myself I'd take a break from writing after reaching The Kiss (ie Chapter 30). The idea was that Cosmosgate would go on hiatus for a few weeks while I plotted out the next bunch of chapters, which only existed as rough outlines so far.

I'm happy to say I did that and the detailed plotting went faster than anticipated —in part because I figured out how to adapt some tricky bits of original Big Finish audio that I'd thought were going to be stumpers— so now I'm moving on to rough-drafting, with the goal of resuming posting chapters within the next couple of weeks.

Here are the working titles for chapters 31-37:

31- Power play

32- Back in the fold

33- A bridge too far

34- And yet, she persisted

35- Control-alt-delete

36- Git checkout master

37- Fianchetto

Feel free to speculate about the title references, I had a bit of fun with them 😆

[kata4a]

git checkout kat/master

[sophia--studies]

100 days of code - day 11

Hi, today I didn't study rust, today I studied JavaScript. Well, I was thinking with myself, I need to finish that full stack course that I started a while ago. Because I never finish what I begin. So I'm going to focus on it a little more. To be honest, I should've taken this decision before. But I want to continue to study rust every day, a little at least.

So, I set my all the node development environment and started to code. I already know a little of JS, but I'm not too comfortable as I'm with C/C++, so I need to practice more.

Also, I was seeing that I know git, but only the basis, like commit, push, pull, and I'm not too used to use commands like branch, merge, rebase, checkout, etc. I've already used them, but since I'm not constantly branching, I have forgotten. So I'm practicing these git commands and git good practices as well.

That's it. Sometimes I feel a little lost, because programming has so many paths to choose from. It can give me a little anxiety, but, as long as I'm studying, progressing, and not paralyzed, I think it's ok.

[bigmeatyflaps]

how do i get drugs if everyone thinks im weird bc im a tranny

darknet

install tails os on a usb + open crypto exchange account (i use kraken but there's a shit ton around) and git a wallet (i only buy using monero & use their monero gui wallet) + read up on pgp & dnbible + idk what markets r popular these days cuz i haven't ordered in a long time (SAD!) but checkout dread or dark.fail ig

have fun 👍

[mentalisttraceur-software]

One frustrating edge case with Syncthing and Git to look out for:

Empirically, just based on observed behavior, it seems that Git has lots of commands that you'd think are read-only, but which in some cases will mutate internal Git state - specifically, the index (normally at ".git/index"). I haven't yet figured out if this can ever happen with other internal ".git" files.

This creates a race condition with any networked filesystem sync - if you do some work on a local checkout of a repo, then switch to another device to continue where you left off, you can't safely check if Syncthing has synced the local changes to the repo in the most intuitive way: by running commands like "git status".

You have to wait until you're sure the changes have synced, or you'll get a Syncthing merge conflict with the Git index file, which will manifest as weird/unexpected results from commands like "git status" and "git diff [--staged]".

(If you want to look more deeply into this, I'd probably start by reading and understanding Git's "Racy Git" documentation, which seems indirectly relevant - it's talking about a different race condition, but I wouldn't be surprised if the optimization which causes that race condition and/or any workaround which mitigates it contributes to this race condition.)

Luckily, it turns out that we can force Git to never mutate the index. With recent Git versions, there's a top-level "--no-optional-locks" flag that will do it: "git --no-option-locks status".