The HIDDEN Git Trick for Resolving Merge Conflicts

preview_player
Показать описание
This handy trick, that even Git's docs consider "hidden", could have saved me so much frustration in the past... Better late than never I guess: meet Git "rerere".

Ways to support this channel:

LINKS

⏱ Timestamps
00:00 - Intro
01:14 - Configuration
01:35 - Walk through
06:10 - Under the hood
07:11 - Merge conflicts with Vim

#neovim #git #neogit #lazygit #terminal #vim #dev #devops #linux #console
  1. DevOps Toolbox
Рекомендации по теме
The HIDDEN Git 0:08:48

The HIDDEN Git Trick for Resolving Merge Conflicts

13 Advanced (but 0:08:07

13 Advanced (but useful) Git Techniques and Shortcuts

SECRET Git Tricks 0:10:04

SECRET Git Tricks No One Knows!

Inside the Hidden 0:08:33

Inside the Hidden Git Folder - Computerphile

So you think 0:47:19

So you think you know Git: Advanced Git Tips and Tricks - Scott Chacon

The true meaning 0:00:44

The true meaning of Git is hidden in the first commits in 2005 #programming #git

THIS Useful Git 0:00:33

THIS Useful Git Hack Is Only Used By Few

5 great Git 0:07:50

5 great Git & IntelliJ IDEA tricks

Git Tricks I 0:11:39

Git Tricks I Wish I Had Known Earlier

Unlock the Secrets 0:00:33

Unlock the Secrets of Git What You Didn t Know

Error-free git push 0:02:17

Error-free git push to a new repository in 2 minutes | Hidden tricks

5 Github Hacks 0:08:16

5 Github Hacks that you should know | for Coders

[English] 5 hidden 0:05:35

[English] 5 hidden tips for streamline your git workflow

display .git folder 0:00:51

display .git folder on Visual Studio Code

⭕If you are 0:00:41

⭕If you are a master of git and github, you definitely don't know about this - code crushers

Git Happens - 0:09:03

Git Happens - Public .git Repositories

Git Hidden Gems 1:03:22

Git Hidden Gems - Enrico Campidoglio - Copenhagen DevFest 2023

Learn Git In 0:15:59

Learn Git In 15 Minutes

How to be 0:46:26

How to be a git expert

Linux tricks you 0:00:58

Linux tricks you should know, git! #github #linux #linux_tutorial #shortsvideo #shorts

Git Tricks (Getting 1:11:48

Git Tricks (Getting Yourself out of Trouble)

version control #programming 0:00:41

version control #programming #git #coding #gitlab #github #softwareengineer

Git REBASE Explained: 0:04:01

Git REBASE Explained: Unveiling Rebase's Hidden Hazard

How to Delete 0:00:39

How to Delete a Git Repository

Комментарии
Автор

I'm a simple guy. I see Devops Toolbox, I hit the like button

typecraft_dev
Автор

Today we learnt how to resolve simple merge conflict in 8 minutes... great job!

AlexVKapa
Автор

Do not use github's logo as git's logo.!!

anmol-fzr
Автор

Nice!! I didn't know this Git feature, thanks for sharing!

BhEaN
Автор

This was making me a bit squeamish until I saw that it didn't just move on through the rebase when using the previous resolution. Nice feature that thankfully is not entirely automated. Definitely the right call by the implementers.

Ulchie
Автор

Great feature thanks for sharing. And thanks for getting one of our keyboard :)

x
Автор

Nice video. I’d never heard of git rerere (the name of the command does not roll of the tongue tho… ha). I’m looking forward to trying this out. Thanks!
Btw your Moonlander tenting game is strong. I’ve got the tenting kit on mine but haven’t gone too far with it yet.

brotein_mancakes
Автор

Great video ! Watching here from Spain. I hope your Spanish learning is going well :)

PabloFernandezFranco
Автор

How are you getting the tenting on your moonlander so high? I'd love to try that on my ergodox ez

mohmaster
Автор

what makes your cat do all that - line numbers, syntax highlight? is that something else that you call cat? I know cat -n does the line numbers, but rest?

myusernameislongerth
Автор

Easy to remember this git command. BTW in spanish H is mutted which means it sounds like ola ;-)

ZilverDx
Автор

whats terminal prompt config? it looks beautiful!

vivgui
Автор

I like simple things, including merger errors.
If it happens, I've done something really wrong, or I'm not alone.
They are not scary, and I should always know about it, as it tells things are working correctly.

JMIK
Автор

Do you have a cold? It sounds like you do

Quephara