chainq, 14 days ago

@root42 You have to edit the conflicted file with any editor, then git add and commit the desired outcome. That is, if you're cherry-picking a single commit. If you're doing multiple commits, you can do git cherry-pick --continue, I think.

root42, 14 days ago

@chainq i had to resolve megabytes of logs. So manual editing was a no-no.

Bubu, 14 days ago

@root42 You can do git checkout --theirs <file>. Which works on a per-file base. Not sure if you can also do this hunk based, maybe? 🤔

(Also I'm not entirely sure if this is what you were asking about, so sorry if I'm missing the point here somewhow.)

root42, 14 days ago

@Bubu file based suffices. It's about reference logs for a regression test where I NEED the upstream version. I managed to do it with magit, smerge in Emacs using a quick keyboard macro...