how to actually merge the code using pull requests?

yogini kothekar

Hi, 

I am new to Bitbucket . We want to use Bitbucket server in Salesforce project.

I have created multiple branches - each for one sandbox. I want to merge the updated code from one of the Dev sandbox branch to the Test sandbox branch. When I create a pull request and merge Dev branch to Test branch, I can see that it actually creates a  new Dev folder inside 'Source' of Test branch and updated the code in Dev folder of Test. But I want the 'Test' code to be updated with latest change and not a separate folder in Test with the updated code.

When I pull data from Test branch to eclipse Egit, I am getting the old code, as it is not actually updating the code in Test branch.

I think I am missing something here. Could anyone please help.

Thanks in advance!

-Yogini

 

Isabella Stephens

Hi Yogini,

Are you still having trouble with this? Reading your post, I think you are doing something like this:

test branch contains:

• /source/test/<your_file_here>

dev branch contains:

• /source/dev/<your_file_here_with_changes>

merging dev branch into test branch results in:

• /source/dev/<your_file_here_with_changes>
• /source/test/<your_file_here>

but what you want is:

• /source/test/<your_file_here_with_changes>

Is that correct? In order to have git update your file with your changes, the file needs to be at the same path on both branches. If you have the file in a different location on different branches then git will treat the files as different files. So instead you might want:

test branch contains:

• /source/<your_file_here>

dev branch contains:

• /source/<your_file_here_with_changes>

merging dev branch into test branch results in:

• /source/<your_file_here_with_changes>

If I've misunderstood the problem you are having I'm happy to try to help if you can give me more details.

Cheers,

Isabella - Atlassian