| $ # Use Live CD to boot | |
| $ sudo su # Switch to root | |
| $ fdisk -l # Get names of root, boot & EFI partition names. you can also use blkid | |
| $ mount /dev/mapper/fedora_localhost--live-root /mnt # mount root partition | |
| $ cat /mnt/etc/fedora-release | |
| Fedora release 31 (Thirty One) | |
| $ mount /dev/nvme0n1p2 /mnt/boot # mount boot partition | |
| $ mount /dev/nvme0n1p1 /mnt/boot/efi # mount EFI partition | |
| # Note: If you are not able to mount EFI partition ('Input/Output error'), | |
| # You may have to repair ESP file system or format ESP. |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)