[arch-dev-public] Conflicting PKGBUILDs between trunk and repos

I'm trying to commit a pkgrel bump on gtk-xfce-engine, but I keep encountered an svn conflict on the PKGBUILDs. I followed the instructions to resolve and commit, but the repos/ subdirs are still showing the old PKGBUILD file even though the trunk has been updated. Is there something I'm missing here? A command perhaps to force the update?