Question

I try to merge two branches – master (current) and UrlHandlePoint (unactive):

$ git merge UrlHandlerPoint

I suggested that it will be cause of conflict because here is an obvious difference at the code (it starts at the same line # 27):

master:

.27    public function actionIndex()
    {
        // renders the view file 'protected/views/site/index.php'
        // using the default layout 'protected/views/layouts/main.php'
        $about="Page content \"About\"";
        $this->render('index', array('res'=>$about));
    }

UrlHandlerPoint:

.27    public function actionIndex($alias=false)
    {
        $data=Data::getDataByAlias('o_kompanii',$alias);
        $this->render('index', array('res' => $data));
    }

But instead of a conflict issue git just takes the version of the master branch.
Have anybody any idea why? And/or what I understand wrong here?

Answer 1

Well, since you don’t answer comments, I’ll try to go ahead and guess. 😉

Difference is not a conflict. My guess is that the file has only been changed in the master branch and therefore, there’s no conflicting change on the branch being merged.