I have followed the recommendation of this site . I repeat this process for everyone who is interested in: Suppose the source project is verified in projectA and the derived project in projectB :
The first time I did:
cd path/to/projectB
git remote add orig_project path/to/projectA
git fetch orig_project
git merge orig_project/master -X theirs
git push
Now every time I need to synchronize changes from projectA to projectB, I do:
git fetch orig_project
git merge orig_project/master
git push
orig_projectcan be any. I used it -X theirsfor the first time, because otherwise all selected changes conflict
source
share