Issue when merging a subtree whose a file has been removed

2015-05-21 Thread adatoccpptranslator
Hi all, I want to use subtrees in one of my projects and I use method desribed here https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging I`m facing issues when merging subtree in my subproject in case some files have been removed from the subtree. I`m running git 1.9.1 on Kubuntu 14.04 sub

Issue when merging a subtree whose a file has been removed

2015-05-21 Thread adatoccpptranslator
Hi all, I want to use subtrees in one of my projects and I use method desribed here https://git-scm.com/book/en/v1/Git-Tools-Subtree-Merging I`m facing issues when merging subtree in my subproject in case some files have been removed from the subtree. I`m running git 1.9.1 on Kubuntu 14.04