smerge-mode
tags :
#
Default apps in Can be used to fix conflicts of git in combination with .
global config file path `~/.gitconfig` or inside the local git repo’s `config` file
[filter “lfs”]
required = true
clean = git-lfs clean – %f
smudge = git-lfs smudge – %f
process = git-lfs filter-process
[user]
name = jaavedd9
email = 38977172+jaavedd9@users.noreply.github.com
# ** here
[merge]
conflictstyle = diff3
From this video, youtube, using conflictstyle = diff3 is more useful, can be set in the git config file per project.
With this style of merging the you view the 3 diffs together:
Other,
Common Origin(parent),
yours
fix the conflict by editing and rerun the conflict check by
smerge-refine
OCR of Images #
2023-07-26_09-00-25_screenshot.png #
1 a Luser] name =E Richard Eisenberg email E raeericharde.dev [branch] autosetupmerge l true o [remote "origin"] push = HEAD [credential] username H rae 0 [diff] ignoreSubmodules E dirty colorMoved =E default vor uncyeA - 1 L:utnuneaa Imerge] 5 conflictstyle = diff3 6 Cnuchl default E upstream 8 [alias] .gitconfig Top (14,0) (Conf[Unix] Undo-Tree)
2023-07-26_09-04-43_screenshot.png #
3441 3442 dbind :: € LIPBind GhcPs 3 Others 3443 dbind : ipvar - exp 3444 <<<<<<< HEAD1 runPV (unECP $3) >>= I $3 -> Common origin 3445 acsA (Ics -> SLLIA $1 $> (IPBind (EpAnn (glR $1) n ) (Left (relocA $1)) $3)) Yours 3446 H111II parent of 9bb4ec3755 (Kill derived constraints) 3447 2 aCsA (Ics >> SLLIA $1 S> (IPBind (EpAnn (glR $1) [mj AnnEqual 52] C (Left $1) $3)) 3448 3449 3 acsA (Ics -> SLLIA $1 $> (IPBind (EpAnn (glR $1) [mj AnnEqual $2] CS? $1 $3)) 3 3450 >>>>>>> 9bb4ec3755 (Kill derived constraints) Captured with Xnip 3451