Mailinglist Archive: opensuse-buildservice (207 mails)

< Previous Next >
[opensuse-buildservice] Conflict in branch
  • From: Claudio Freire <klaussfreire@xxxxxxxxx>
  • Date: Thu, 17 Mar 2011 12:44:54 -0300
  • Message-id: <AANLkTikuBD6Wg_F_fBXrFaGQB7bWb0--qNJ==RoGDWCz@mail.gmail.com>
Hi, I have this branch of the pgadmin3 project:

https://build.opensuse.org/package/show?package=pgadmin3&project=home%3Aklaussfreire%3Abranches%3Aserver%3Adatabase%3Apostgresql

It was ok, until recently there seems to have been a conflicting
change in the parent project since the status changed to broken:
conflict in pgadmin3.spec

I have no access to the osc tool currently, only the web ui - how can
I resolve the conflict from there? I can't even get a description of
the conflicting changes.
--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >
Follow Ups