Merge Code

1. Merge code

+ You're staging on [Current_Branch]

+ You pull code from remote [origin] [Other_Branch]

2. Conflict

Example: 

<<<<<<< HEAD  //=> From Branch you pull [Other Branch]

        $query = $this->abcConnection()->table('table_a as table_a')->select('*');

=======

//=> on current code, [Current Branch]

        $query = $this->acbConnection()->table('table_a')->select('*');

>>>>>>> 36c57d480ba7e8dde31ed79f123d16b9bf3db240

3. Update