search

Murmele / Gittyup

Understand your Git history!
https://murmele.github.io/Gittyup
MIT License
1.37k stars 107 forks source link

accept theirs and accept yours very flaky especially with deleted files #672

Open 0verEngineer opened 7 months ago

0verEngineer commented 7 months ago

Most of the time when i use accept theirs and accept yours it does not work properly. The conflict is not resolved sometimes, sometimes it works but it is still shown as conflict.