Patched PKGBUILD fails rebase even with successful conflict resolution

[emilyyyylime]

My ~/.cache/paru/clone/swayosd-git:

On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	SwayOSD/                                           swayosd-git-debug-r57.1127176-1-x86_64.pkg.tar.zst swayosd-git-r48.bb83b26-1-x86_64.pkg.tar.zst       swayosd-git-r57.1127176-1-x86_64.pkg.tar.zst
	pkg/                                               swayosd-git-debug-r58.d304967-1-x86_64.pkg.tar.zst swayosd-git-r50.42037f9-1-x86_64.pkg.tar.zst       swayosd-git-r58.d304967-1-x86_64.pkg.tar.zst
	src/                                               swayosd-git-r44.1c7d2f5-1-x86_64.pkg.tar.zst       swayosd-git-r55.a0709bc-1-x86_64.pkg.tar.zst

nothing added to commit but untracked files present (use "git add" to track)
* e6ead3b (HEAD -> master) add --reconfigure
* 85034fc (origin/master, origin/HEAD) Updated pkgver to use current tag
* ...

Paru output: (with paru -S swayosd-git)

:: Downloading PKGBUILDs...
 PKGBUILDs up to date
error: command failed: /home/emilylime/.cache/paru/clone/swayosd-git: git -c user.email=aur -c user.name=aur merge --no-edit --no-ff --no-commit:
    Resolved 'PKGBUILD' using previous resolution.

At this point paru aborts and leaves the repo in an in a broken state. Why does it even try to rebase again? the current HEAD is already later than the remote.

Also see #835 (A 2 year old discussion with no resolution)

[emilyyyylime]

I can't even get paru to stop stubbornly insisting on reapplying my patch having reset the git repo. Has support for patching PKGBUILDs ever worked properly?

[Morganamilo]

Works for me when I use it.

Resolved 'PKGBUILD' using previous resolution. is a strange error message. I guess it's some sort of weird case that's actually a success but it returns non 0 so throws paru off? Can you get the output and return code of that case?

I can't even get paru to stop stubbornly insisting on reapplying my patch having reset the git repo.

Yeah paru will reset back to the last reviewed point for safety. Then it does a fetch and rebase instead of a pull to accommodate for patches. It does this for all packages because it's been fine up until now. But we can change it to only rebase packages that have new commits if it solves issues.