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
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.
SELECT O.ORGID ORG,
MR.F_NND ( locsp.alterDATE) Altereddate_pc,
L.owner --here the 2 columns are there
FROM Max.SITE S,
(SELECT et.tech, lo.alterdate
FROM Max.LOCS lo,
WHERE c.clss_id = 'UNIT') locsp
WHERE S.SITEID = L.SITEID
SELECT '1.1' ORG,
'Dummy Region' Site_reg,
'Dummy Plant' l_plant,
'Dummy System Description' description,
TO_DATE ('07/13/2015 12:00:01 AM', 'MM/DD/YYYY HH:MI:SS AM') Altereddate_pc,
NULL -- here 2 columns are there
Please help to understand cause of issue and how it can be solved.