12 Jun
2018
12 Jun
'18
09:56
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 Regards, ismail -- SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)