Search results

Simple language special cases

enhancement

Status: Open.

#51 In Peaker/git-mediate;

· yairchu opened on Aug 5, 2024

Rename main branch :)

devopsDeveloper ErgonomicsDeveloper Ergonomics

Status: Open.

#50 In Peaker/git-mediate;

· yairchu opened on Aug 5, 2024

Auto-resolve lines added before or after

enhancement

Status: Open.

#49 In Peaker/git-mediate;

· yairchu opened on Jul 23, 2024

Haskell stack error when installing on Ubuntu

Status: Open.

#47 In Peaker/git-mediate;

· Svalorzen opened on Dec 7, 2023

Ubuntu package

help wanted

Status: Open.

#46 In Peaker/git-mediate;

· Svalorzen opened on Dec 7, 2023

Encountered an error while trying to install via haskell stack

Status: Open.

#38 In Peaker/git-mediate;

· TomerBass opened on Sep 6, 2022

Auto-reduce deleted lines

enhancement

question

Status: Open.

#34 In Peaker/git-mediate;

· yairchu opened on Nov 10, 2021

git add or just clear conflicts according to action

enhancement

Status: Open.

#29 In Peaker/git-mediate;

· yairchu opened on May 10, 2021

Merge of type-change (data->symlink) and data-change (data->data) handled incorrectly

bug

Status: Open.

#28 In Peaker/git-mediate;

· Peaker opened on Mar 2, 2021

Support nested conflicts aka git "temporary merge branches"

enhancement

Status: Open.

#24 In Peaker/git-mediate;

· yairchu opened on Dec 9, 2019

after configuring merge.conflictstyle automatically with -s, git-mediate causes parse error

enhancement

question

Status: Open.

#23 In Peaker/git-mediate;

· eshels opened on Aug 9, 2018