Am Dienstag, 12. Juni 2018, 11:56:36 CEST schrieb İsmail Dönmez:
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
That helped, thanks! As this is now some effort to fix all files, what is the recommended procedure if you are not intended to change anything within a branch? osc linkpac? Thanks Axel -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org