06 January 2020

blog ssh git

Trouvé le parcours suivant sur SO :

git remote add unrelated <url-of-other-repo>
git fetch unrelated <branch-in-other-repo>
mkdir -p <path/to/new/code>
touch <path/to/new/code/>temp
git add <path/to/new/code/>temp
git commit -m 'Bring in new directory'
git merge --no-ff unrelated/<branch-in-other-repo> -s recursive -Xsubtree=<path/to/new/code>
git rm <path/to/new/code/temp>
git commit --amend --no-edit
git remote remove unrelated 

Pour importer evaluation-liquibase dans la branche liquibase de sidtp-db

# executé dans MinGW, ce qui explique le chemin
git remote add unrelated /c/Users/hnl-bis/workspace/essaiLiquibase
git fetch unrelated master
git commit -m 'Preparing merge of essai-liquibase'
git merge --no-ff unrelated/master -s recursive --allow-unrelated-histories
git commit --amend --no-edit
git remote remove unrelated 

Références