This is port of magit functionality when discarding a file change fails because of resolved conflicts (e.g. during merge). In such cases it prompts to checkout our stage, their stage or to leave conflicts for manual resolving. If our or their stage is selected, it additionally automatically git adds this file.
kahole
commented
1 year ago
This is port of magit functionality when discarding a file change fails because of resolved conflicts (e.g. during merge). In such cases it prompts to checkout our stage, their stage or to leave conflicts for manual resolving. If our or their stage is selected, it additionally automatically
git adds this file.