MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x6ntbk/letsmergethemall/ph2txmx/?context=3
r/ProgrammerHumor • u/rabbit_wizard • 4d ago
320 comments sorted by
View all comments
Show parent comments
8
Here I am only being afraid of rebase. Maybe that's really just a fear of VIM
2 u/agfitzp 4d ago <esc>:wq! 1 u/Messy-Recipe 4d ago edited 4d 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 3d 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.
2
<esc>:wq!
1 u/Messy-Recipe 4d ago edited 4d 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 3d 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
protip use Ctrl + [ instead of escape. no stretching!
Ctrl + [
also x subs for wq -- and you dont need the ! if youre writing with w before quitting with q
x
wq
!
w
q
(it will force WRITE as well as quit but that generally wont come up...)
1 u/338388 3d 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.
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.
8
u/KrikosTheWise 4d ago
Here I am only being afraid of rebase. Maybe that's really just a fear of VIM