Programmer Humor

32480 readers

284 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.

founded 5 years ago

MODERATORS

AgreeableLandscape@lemmy.ml

cat_programmer@lemmy.ml

1081

I'm going to sit down and actually learn git this week (midwest.social)

submitted 1 year ago by seahorse@midwest.social to c/programmerhumor@lemmy.ml

77 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] erogenouswarzone@lemmy.ml 10 points 1 year ago* (last edited 1 year ago) (1 children)

Great meme, and I'm sure op knows this, but for anyone else who is curious...

007 in theory means:

00: you have already committed your code to your local code base
7: When you try to merge your code with everyone else's there are 7 files that others have worked on since you last refreshed your local code base.

To resolve this, you need to go file by file and compare your changes with the changes on the remote code. You need to keep the changes others have made and incorporate your own.

You can use git diff file_name to see the differences.

If you have made small changes, it's easier to pull and force an overwrite of your local code and make changes again.

However multiple people working on the same files is usually a sign of organizational issues with management. Ie, typically you don't want multiple people working on the same files at the same time, to avoid stuff like this.

If you're not sure, ask someone that knows what they're doing before you follow any advice on Lemmy.

[–] aniki@lemm.ee -1 points 1 year ago (3 children)

this is bad advice. Never force git to do anything. If you're forcing something you're doing it wrong.

you can always git fetch -a; git merge -X theirs remote-branch or rebase your branch.

[–] jjjalljs@ttrpg.network 3 points 1 year ago

If I get a big conflict and I know my change is trivial, I feel perfectly okay doing git fetch git reset --hard whatever and then reapplying my simple change as a new commit. Sort of a bootleg rebate.

[–] zalgotext@sh.itjust.works 1 points 1 year ago

If you use a squash workflow, you're going to be force pushing a ton.

Never force git to do anything. If you're forcing something you're doing it wrong.

This is bad advice. Better advice would be "know and understand your tool, and know the consequences of your actions".

[–] erogenouswarzone@lemmy.ml 1 points 1 year ago

I hear what you're saying.

First, I hard disagree with you. Overwriting my local version of code is a parachute - not an ideal landing, but better than merging by hand.

Also, my comment was not an attempt to teach everything about git, just to explain what is happening in simple terms, since git requires a lot of experience to understand what those messages mean.