git merge 時に内容が異なるファイルをマージ対象から除外する - Qiita

# develop で commit && push $ git checkout develop $ echo "by develop" >> ignore_target_file by develop $ git add . & git commit -m "by develop" & git push # master で commit && push $ git checkout master $ echo "by master" >> ignore_target_file by master $ git add . & git commit -m "by develop" & git push # Marge: develop -> master $ git merge develop Merge made by the 'recursive' strategy. # merge