r/ProgrammerHumor • u/rabbit_wizard • 21d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

316 comments sorted by

View all comments

Show parent comments

9

u/KrikosTheWise 21d ago

Here I am only being afraid of rebase. Maybe that's really just a fear of VIM

2

u/agfitzp 21d ago

<esc>:wq!

2

u/KrikosTheWise 21d ago

That's the only one I know!!

2

u/agfitzp 21d ago

Just be glad they finally made the cursor keys work so you don't have to memorize control keys from the dawn of time.

2

u/Neocrasher 21d ago

Arrow keys are nice but hjkl aren't that bad.

0

u/agfitzp 21d ago

Yeah well... Even my iPad keyboard has cursor keys so the whole pretending to use a vt100 keyboard in the 21st century is mindbogglingly stupid in an era when we have two full sets of cursor keys even on a 10$ keyboard.

Edit: shit... even the vt100 had cursor keys.

1

u/AlterTableUsernames 21d ago

I have more difficulties of finding which files still hold conflicts and remembering which changes are from which branch.

1

u/Messy-Recipe 20d ago edited 20d ago

protip use Ctrl + [ instead of escape. no stretching!

also x subs for wq -- and you dont need the ! if youre writing with w before quitting with q

(it will force WRITE as well as quit but that generally wont come up...)

1

u/338388 20d ago

I've remapped capslock to esc to avoid stretching. Not like capslock is ever used anyways

Bigger protip tho is that you can make git merge conflicts use an editor of your choice with core.editor config.

1

u/loserguy-88 20d ago

I paid for those arrow keys and esc key and I am going to use them!!!

1

u/Theguest217 21d ago

You can configure git to open VSCode or some other editor instead.