14 Dec
2021
14 Dec
'21
12:34
On 12/14/21 16:09, Marcus Hüwe wrote:
Run "osc pull" inside the the checked out package, fix the conflicts (see "osc st" for files that have a conflict ("C")), run "osc resolved ..." and commit the changes via "osc ci".
Thanks for the clear instructions, worked great !