Monthly Archive: November 2017

CONFLICT (submodule): Merge conflict in 'xyz' 0

CONFLICT (submodule): Merge conflict in 'xyz'

CONFLICT (submodule): Merge conflict in orthrus/external [dev@baobab vf]$ git checkout -b KRAK-1541-cleanup vfcore/orthrus/external: needs merge vfcore/vfcommonlib: needs merge error: you need to resolve your current index first [dev@baobab vf]$ git status # On branch...