On Thu, Apr 17, 2008 at 3:21 PM, Daniel Isenmann <[EMAIL PROTECTED]> wrote: > Hi, > > following problem on merging opera-devel in unstable: > > > $ unstablepkg > ===> Uploaded opera-devel-9.50-0.20-x86_64.pkg.tar.gz > ===> Commited with "upgpkg: opera-devel 9.50-0.20" message > C ../repos/unstable-x86_64/PKGBUILD > > property 'svnmerge-integrated' set on '../repos/unstable-x86_64' > > ~/svn/opera-devel ~/svn/opera-devel/trunk > svn: Commit failed (details follow): > svn: Aborting commit: > '/home/ise/svn/opera-devel/repos/unstable-x86_64/PKGBUILD' remains in > conflict ~/svn/opera-devel/trunk > ===> Tagged for unstable-x86_64 > > > The i686 one worked, but the x86_64 not. Now I have 4 PKGBUILDs in my > repo/unstable-x86_64: > > $ ls repos/unstable-x86_64/ > PKGBUILD PKGBUILD.merge-right.r318 opera.desktop > PKGBUILD.merge-left.r304 PKGBUILD.working opera_logo48.png > > The PKGBUILD.merge-right.r318 is the right one, which should be in the > svn, but I don't have enough svn knowledge to solve the merging problem. > > Can someone please give me some advice or solve the merging problem??
If I know svn right, all you need to do is correct the PKGBUILD file (it should have the differences in there with the <<<< and >>>> markup) and remove the other suffixed files, then commit.
