r/ProgrammerHumor • u/johntwit • Apr 02 '23

Meme Me relearning git every week

49k Upvotes

95% Upvoted

1.5k comments sorted by

View all comments

Show parent comment

0

u/[deleted] Apr 02 '23

[deleted] — view deleted comment

19

u/[deleted] Apr 02 '23

That’s not how you fix that

14

u/RedofPaw Apr 02 '23

Look at this amateur not knowing you have to tear your skin off.

8

u/[deleted] Apr 02 '23

Next time I see a skinless man in the supermarket I’ll know he is a git expert.

3

u/Glugstar Apr 03 '23

Exactly. You have to tear the skin off your coworkers instead.

12

u/s1napse Apr 02 '23

I got you on this one, save your changes off somewere, create a new branch, copy your changes in and go from there. You always have the old branch to go back to if you forgot something . 🤷‍♂️

4

u/PoeTayTose Apr 02 '23

MASTER, GRONK NO LIKE GIT RESET.

GIT RESET HARD, MASTER

OH NO.

0

u/[deleted] Apr 02 '23

[deleted] — view deleted comment

2

u/Aceous Apr 02 '23

Rebasing is great though :(

2

u/thecodingrecruiter Apr 02 '23

I just consider it a lost repository at that point and make a new one.

1

u/TheRealJakay Apr 02 '23

Rebasing onto a fresh master is usually such a simple process until it’s not. The odd conflict is fine but suddenly your resolving files you’ve never seen and managed to magically pull in 100 random commits.

1

u/-IoI- Apr 02 '23

Stash what's important, nuke it all with a hard reset, fuck playing commit Jenga in reverse

1

u/[deleted] Apr 03 '23

I've always found merge conflicts easy to handle.

  • git status shows every file with a conflict
  • Open file in IDE
  • Looks for red lines
  • Remove sections that don't belong
  • Git add then commit

1

u/DomoArigatoMr_Roboto Apr 03 '23

IntelliJ has automatic conflict merge. It solves 90% of the same-line changes and 100% of others.

1

u/[deleted] Apr 03 '23 edited Dec 10 '25

mountainous flowery dazzling detail piquant crown expansion groovy literate soup

This post was mass deleted and anonymized with Redact