Skip to content

Instantly share code, notes, and snippets.

@chalstrick

chalstrick/t.sh

Created June 10, 2020 07:33
Show Gist options
  • Save chalstrick/ee18d33988d4751fbd640b2c035f61f9 to your computer and use it in GitHub Desktop.
Save chalstrick/ee18d33988d4751fbd640b2c035f61f9 to your computer and use it in GitHub Desktop.
Download ZIP
Inspect native git behaviour on mergeConflicts on gitlinks
Raw
t.sh
git init subm
touch subm/a
git -C subm add a
git -C subm commit -m initSubm
git init root
git -C root submodule add ../subm
git -C root commit -m addingSubm
echo forMaster >>root/subm/a
git -C root/subm commit -a -m modSubmInMasterContext
git -C root commit -a -m updateSubmInMaster
git -C root checkout -b side --recurse-submodules HEAD~
echo forSide >>root/subm/a
git -C root/subm commit -a -m modSubmInSideContext
git -C root commit -a -m updateSubmInSide
git -C root merge master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment