title: How to merge laravel project git from colleague
body: <p>I'm working on laravel project with git repository. I would like to merge code with my colleague. But I do not understand much for git merging. </p>
  
  <p>For example: Below is current remote code.</p>
  
  <pre><code>class SettingTestTopicController extends Controller
  {
      public function Index(){
          return view('setting.testtopic.index');
      }
  }
  </code></pre>
  
  <p>And below is my code </p>
  
  <pre><code>class SettingTestTopicController extends Controller
  {
      public function Index(){
          return view('setting.testtopic.index');
      }
  
      public function Create(){
          return view('setting.testtopic.create');
      }
  }
  </code></pre>
  
  <p>And another is my colleague's code.</p>
  
  <pre><code>class SettingTestTopicController extends Controller
  {
      public function Index(){
          return view('setting.testtopic.index');
      }
  
      public function Edit($id){
          return view('setting.testtopic.edit');
      }
  }
  </code></pre>
  
  <p>There're three different codes.If my colleague push code to git, so remote code will be like him. My need is, once I pull latest to my local. I would like to append like below.</p>
  
  <pre><code>class SettingTestTopicController extends Controller
  {
      public function Index(){
          return view('setting.testtopic.index');
      }
  
      public function Create(){
          return view('setting.testtopic.create');
      }
  
      public function Edit($id){
          return view('setting.testtopic.edit');
      }
  }
  </code></pre>
  
  <p>Any advice or guidance on this would be greatly appreciated, Thanks</p>