This might seem basic, but I am new to Drupal (and, to and extent, git).
I've made some changes to a Feature and downloaded its files to be pushed up to the remote server with git. However, I get the following merge conflict:
<<<<<<< HEAD $pane->uuid = '992af322-74c5-4a5c-a261-1e73677d3645'; $display->content['new-992af322-74c5-4a5c-a261-1e73677d3645'] = $pane; $display->panels['content'] = 'new-992af322-74c5-4a5c-a261-1e73677d3645'; ======= $pane->uuid = 'bf806592-c85c-4155-a97c-516f72427e4e'; $display->content['new-bf806592-c85c-4155-a97c-516f72427e4e'] = $pane; $display->panels['content'] = 'new-bf806592-c85c-4155-a97c-516f72427e4e'; $pane = new stdClass(); >>>>>>> refs/heads/my-branch
I would know what to do with a conflict with other code, but this is all very foreign to me and I don't want to break anything.
Would anyone know the best course of action here?