Vim screencast #77: Merge conflicts

preview_player
Показать описание
Links:
  1. Greg Hurrell
  2. vim
Рекомендации по теме
Vim screencast #77: 0:16:11

Vim screencast #77: Merge conflicts

Resolve a Git 0:05:26

Resolve a Git Merge Conflict within Vim | Vim 🔥 Tips and Tricks

Vim screencast #76: 0:10:23

Vim screencast #76: vcs-jump

git merge conflicts 0:13:39

git merge conflicts using vimdiff

git mergetool explained 0:07:05

git mergetool explained

Git Merge • 0:03:43

Git Merge • Gapply.vim (Andrew Radev)

Vim screencast #70: 0:14:35

Vim screencast #70: SpaceFN

Vim screencast #23: 0:07:06

Vim screencast #23: Macro tricks

Vim Techniques 17 0:27:47

Vim Techniques 17 - vimdiff (part 2)

Vim screencast #19: 0:05:05

Vim screencast #19: Case tricks

Vim screencast #72: 0:04:52

Vim screencast #72: tabline

Vim screencast #79: 0:09:15

Vim screencast #79: Project-specific overrides

Vim screencast #80: 0:07:26

Vim screencast #80: Learning Vim

CIS 233J Resolving 0:13:45

CIS 233J Resolving PR merge conflicts with git bash (vim)

diffconflicts - A 0:04:29

diffconflicts - A better Vimdiff Git mergetool

Vim screencast #83: 0:07:28

Vim screencast #83: Emoji

Staging Git Commits 0:03:36

Staging Git Commits within Vim: Part 3 | Vim 🔥 Tips and Tricks

Vim Split and 0:00:54

Vim Split and open multiple files

Vim screencast #78: 0:10:33

Vim screencast #78: Language Server Protocol

Screencast for lambdalisue/gina.vim 0:02:06

Screencast for lambdalisue/gina.vim #1 issue

Vim screencast #84: 0:20:27

Vim screencast #84: Corpus

Vim screencast #50: 0:03:25

Vim screencast #50: Email demo

Vim screencast #2: 0:05:48

Vim screencast #2: Folding

Vim screencast #88: 0:08:55

Vim screencast #88: Tampermonkey

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

Top and bottom is easy. Top is always the base branch. Bottom is always the incoming branch.


When you're merging, the incoming branch is the other branch you're merging with. When you're rebasing, what you're doing is essentially checking out the onto branch and then replaying the changelist you selected to the onto branch. If you think about what the underlying operations are doing, the directionality is obvious and no longer becomes an issue.

lieryan
Автор

Great video as always. I'm a big fan.
How did you copy the commit hash in your shell around time marker 11:38 ? Was that a zsh feature? or perhaps tmux?

gpaulsen
Автор

Love your hair mate! for the last few video's it feels like you are home sick and bored.. make vim videos yay!..

enetheru
Автор

Thanks for the new video!
Could you pls tell how you did syntax highlight off in not focused splits?

horseinthesky
Автор

I hope the rerere will help me. Been merging two branches multiple times and fixes the same errors. I’m guessing the merge base doesn’t update if a couple files haven’t been merged across?

daniel
Автор

Fantastic work man!
I have a question not related to this video. What are the efficient ways to search for a file in a huge directory? I used Ctrl+p and NerdTree, recursive - e **/filenname* - in the past, They are ok. Anything better?

harshvardhansharma