Issues

Simple language special cases
Peaker/git-mediate#51 · opened on Aug 5, 2024
Rename main branch :)
Peaker/git-mediate#50 · opened on Aug 5, 2024
Auto-resolve lines added before or after
Peaker/git-mediate#49 · opened on Jul 23, 2024
Haskell stack error when installing on Ubuntu
Peaker/git-mediate#47 · opened on Dec 7, 2023
Ubuntu package
Peaker/git-mediate#46 · opened on Dec 7, 2023
Encountered an error while trying to install via haskell stack
Peaker/git-mediate#38 · opened on Sep 6, 2022
1
Auto-reduce deleted lines
Peaker/git-mediate#34 · opened on Nov 10, 2021
git add or just clear conflicts according to action
Peaker/git-mediate#29 · opened on May 10, 2021
Merge of type-change (data->symlink) and data-change (data->data) handled incorrectly
Peaker/git-mediate#28 · opened on Mar 2, 2021
Support nested conflicts aka git "temporary merge branches"
Peaker/git-mediate#24 · opened on Dec 9, 2019
after configuring merge.conflictstyle automatically with -s, git-mediate causes parse error
Peaker/git-mediate#23 · opened on Aug 9, 2018