ok, so, you need to go by an intermediary branch as git merge or rebase only
commits
From your clean develop branch:
git checkout -b temp
git checkout origin/release4.9 RELEASE_NOTES <FILE2> <FILEX>
git add -u
git commit -m "Merge RELEASE_NOTES, etc.. from release4.9 branch"
git checkout develop
git rebase temp
git mergeTool RELEASE_NOTES
git rebase --continue
git mergeTool <FILE2>
git rebase --continue
git mergeTool <FILEX>
git rebase --continue
git branch -d temp
git push
-----Message d'origine-----
From: Justin Mclean
Sent: Tuesday, April 16, 2013 12:20 AM
To: dev@flex.apache.org
Subject: Re: Git merge of README and RELEASE_NOTES
HI,
git checkout origin/release4.9 RELEASE_NOTES <FILE2> <FILEX>
That just replaces the current RELEASE_NOTES file with the 4.9 one. What do
you need to do to merge the changes on both files together?
Thanks,
Justin
