[arch-dev-public] Error merging opera-devel
dpmcgee at gmail.com
Thu Apr 17 18:00:53 EDT 2008
On Thu, Apr 17, 2008 at 4:52 PM, Daniel Isenmann <daniel.isenmann at gmx.de> wrote:
> On Thu, 17 Apr 2008 16:35:42 -0500
> "Aaron Griffin" <aaronmgriffin at gmail.com> wrote:
> > 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.
> Thanks, it worked. I have seen the <<<<<< and >>>>>> and correct them,
> but I forgot to delete the other files....
Try "svn resolved".
More information about the arch-dev-public