Last modified: 2013-01-30 12:48:34 UTC
When jenkins fetch a change to run test on, it attempts a merge against latest master. We often end up with a conflict in the release note files which are not really relevant to tests. Example: 21:01:45 + git merge FETCH_HEAD 21:01:45 Auto-merging RELEASE-NOTES-1.20 21:01:45 CONFLICT (content): Merge conflict in RELEASE-NOTES-1.20 21:01:45 Auto-merging languages/messages/MessagesEn.php 21:01:45 Auto-merging languages/messages/MessagesQqq.php 21:01:45 Automatic merge failed; fix conflicts and then commit the result. 21:01:45 Build step 'Execute shell' marked build as failure 21:01:45 Finished: FAILURE Git support per files merge strategy, so we could use 'ours' to just overwrite latest master : http://stackoverflow.com/questions/332528/is-it-possible-to-exclude-specific-commits-when-doing-a-git-merge/3970442#3970442 Relevant script would be integration/jenkins , file bin/fetch_gerrit_head.sh
With our new workflow, we always attempt a merge against latest master. In some case we will eventually automatically merge the change. I dont think we should ignore release notes conflict but still ask for a rebase.
