Help
cancel
Showing results for 
Search instead for 
Did you mean: 
Copilot Lvl 2
Message 1 of 2

Merging a file that is different between two branches

I have two branches (devl and acpt). One of the file is different in the two branches

 

>git status
On branch acpt
Your branch is up-to-date with 'origin/acpt'.
nothing to commit, working tree clean
>git diff --name-only devl acpt
etc/system.js

I want to merge this file from devl to acpt branch. git merge doesn't seem to be doing. Can someone help

>git merge devl
Merge made by the 'recursive' strategy.

> git diff --name-only devl acpt
etc/system.js
1 Reply
Copilot Lvl 2
Message 2 of 2

Re: Merging a file that is different between two branches

I noticed in my devl branch the following commit. But not sure what this means. These two lines have been deleted from devl branch. But not able to merge it into acpt branch.

 

<<<<<<< HEAD
    var edSerial = custom_info.eventDetails.ServerSerial ? parseInt(custom_info.eventDetails.ServerSerial) : eSerial;
    event.set("external_id", edSerial);
=======
>>>>>>> 096705ce52b023888ab46e8a8888cb5e3981ccfd