On 28/06/18 11:03, Christoph Feck wrote:
On 12.06.2018 11:56, İsmail Dönmez wrote:
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec
Is there any way to issue such osc commands when working with the web interface? I have branched several packages, and currently delete then branch again when a conflict in spec file occurs.
No currently you need to checkout the repository locally with the commandline tools, use osc pull, manually merge any changes, mark them as resolved with osc then commit them. This workflow isn't currently possible from the web interface, I agree in some cases it would be pretty useful though. -- Simon Lees (Simotek) http://simotek.net Emergency Update Team keybase.io/simotek SUSE Linux Adelaide Australia, UTC+10:30 GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B