Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

few changes vanished after resolving merge conflicts on pull request

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

1 answer

0 votes
minnsey Atlassian Team Nov 07, 2018

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?

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 Atlassian Team Nov 08, 2018

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

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,387 views 4 5
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you