I have already recreated the branch and merge to the master branch, based on Alex's suggestion. Yet, why the builds still fails?
Any help is appreciated!
Thanks

Re: [opencv] #3714 bug fix (#3440)
Alexander Alekhin (notifications@github.com) 2:51 PM Keep this message at the top of your inbox Groups

There is wrong target branch for merge.

1. Remove dash (#) from your branch name
2. Recreate and use 2.4 or master for merge target

Target branch is right now.

Last problem is:

Auto-merging doc/tutorials/introduction/display_image/display_image.rst
CONFLICT (content): Merge conflict in doc/tutorials/introduction/display_image/display_image.rst
Automatic merge failed; fix conflicts and then commit the result.

This usually means that someone recently updated same code. And your patch can't be applied automatically.

You need to update your code (look for "git rebase"). Commands are similar to:

1. git checkout bug3714_fix
2. update OpenCV code: git fetch origin
3. git rebase origin/master
5. git add -i
7. git rebase --continue
8. check changes and call "git push" with "-f" flag. This pull request will be updated automatically.

Thank Alex, I got it all fix now

@HelenWong, you still need to squash your commits.

Hi ilya, thanks for letting me know. I have already followed the squash commands as suggested by this link: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
Yet, I don't know if I have done it correctly or not since I still see my several commits on my repo

 -+ IMREAD_UNCHANGED (<0) loads the image as is (including the alpha channel if present)
 - + IMREAD_GRAYSCALE ( 0) loads the image as an intensity one
 - + IMREAD_COLOR (>0) loads the image in the RGB format
 + + CV_LOAD_IMAGE_UNCHANGED (<0) loads the image as is (including the alpha channel if present)
 + + CV_LOAD_IMAGE_GRAYSCALE ( 0) loads the image as an intensity one
 + + CV_LOAD_IMAGE_COLOR (>0) loads the image in the RGB format

Guys, why are we bringing back the old CV_ variables in the 2.4 documentation. Since 2.4.8 the code is supporting the new parameters with the CV_ part in front of it and the documentation was changed to make people use the new variables. The CV_ ones are disappearing in the near feature right with the 3.0 release?

Certainly when the source base code already has these parameters!

https://github.com/Itseez/opencv/search?utf8=%E2%9C%93&q=IMREAD_UNCHANGED
https://github.com/Itseez/opencv/search?utf8=%E2%9C%93&q=IMREAD_GRAYSCALE
https://github.com/Itseez/opencv/search?utf8=%E2%9C%93&q=IMREAD_COLOR

So I think that is a very stupid change to do ... just my 2 cents!

As to the squash, just use git rebase -i HEAD~5 and follow the instructions!

commits are squashed already. Thanks for everyone's help.
As to the CV_variables mentioned by Steven, I actually don't know why or who bring back those old CV_variables. My guess is because there are people still using the old version, which still use the old CV_variables, and that's why the documentation should include that?
Anyway, I am very new to this project and I am just trying to improve something with this project.

The reason my file contains the old CV_variables because my changes are based on 2.4.9 branch

Thanks for the changes. But please pull in the latest 2.4 branch, apply your changes there and then make a new PR. Then the variable change should not happen and your PR will be fine.

I actually just changed those variables manually and I am not sure if this fix the problem.
In addition, I am wondering should I pull in the latest 2.4 branch or the master branch?
Thanks!

Since it is a fix of existing 'stable' functionality this should definately go in the 2.4 branch. The reason of the variables was indeed pulling 2.4 towards master branch and we do not want that :)

So please make a new PR, reference this one and close this one down then.