git merge - Git Subtree Merging reports conflict when merging a simple upstream change -
i'm getting started learning subtree merging in git 1.8.2. have created simple example test change third party repo migrating main project. i'm following 6.7 git tools - subtree merging example. the 'sub' project included subdirectory in 'main' project. after make change 'sub' project, git reports conflict when try merge change 'main' project. test summary created repos projects 'main' , 'sub' (sub instead of rack) add remote named sub_remote main refers sub track sub_remote using sub_branch change , commit 1 line in file in 'sub' project pull changes sub on main/sub_branch merge main/sub_branch main/master. the merge fails conflict. merge confused version of changed line keep. <<<<<<< head main ======= main upstream change >>>>>>> sub_branch main.git sub sub.git tm complete test script #!/bin/sh # initialize empty repos in main sub rm -rf $i{,.g...