few changes vanished after resolving merge conflicts on pull request

[sania]

Hi Team,

I worked on a query in local machine. Adding 2 new columns .created a feature for the changes made, and committed in source tree. And then created a PULL REQUEST for the feature.

And then some merge conflicts were faced, which were resolved .Then after that when I pulled changes, 2 columns vanished.

See sample query

CREATE OR REPLACE FORCE VIEW MR.DIM_LOC

(
ORG,

TURBTECH

 HERE THERE SHOULD BE 2 COLUMNS, Altereddate_pc and owner. The columns are missing here. which are missing after resolving merge conflicts of pull request.
)
AS
SELECT O.ORGID ORG,
locsp.tech,

MR.F_NND ( locsp.alterDATE) Altereddate_pc,
L.owner --here the 2 columns are there
FROM Max.SITE S,
Max.LOCS L,
Max.ORGZ O,

(SELECT  et.tech, lo.alterdate 
FROM Max.LOCS lo,
Max.clsstruc c,
MR.etl_mod et,
WHERE c.clss_id = 'UNIT') locsp

WHERE S.SITEID = L.SITEID

UNION ALL

SELECT '1.1' ORG,
'Dummy Region' Site_reg,
'Dummy Plant' l_plant,
'Dummy System Description' description,
NULL,
TO_DATE ('07/13/2015 12:00:01 AM', 'MM/DD/YYYY HH:MI:SS AM') Altereddate_pc,
NULL -- here 2 columns are there
FROM DUAL;

Please help to understand cause of issue and how it can be solved.

Thank you

[minnsey]

Hi 

How was the conflict resolved, did you accept all the changes from one side or another?

Do you have a merge commit showing the changes applied by the merge?

[sania]

Hi,

I accepted all the changes from one side, which I wanted.

Yes, merge commit  is shown in bitbucket. 

And in difference tab the 2 columns are highlighted in red, showing they are no more in query

[minnsey]

It sounds like you accepted the wrong side of the merge perhaps?