to resolve this you need to either
Code: Select all
git stash
git pull
git stash apply
Code: Select all
git reset --hard
git pull
Code: Select all
git stash
git pull
git stash apply
Code: Select all
git reset --hard
git pull
Code: Select all
SampleIDs=sizeonly