Category: git

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...

Git create patch with submodules 0

Git create patch with submodules

Method #1   Commit your changes but do not push yet git format-patch -n HEAD^ Then go in each submodule you care and do the sam Method #2 Submodules git submodule --quiet foreach --recursive...

Git log with full diff 0

Git log with full diff

Git log full-text with search git log -p | grep <SEARCH_STRING> Git log of a single file $> git log -p --follow <PATH/FILENAME> Git log of a single commit todo Git diff between two branches...