Ttdfjt

Preventing Employees from either switching to Competitors or Opening Their Own Business

1980s live-action movie where individually-coloured nations on clouds fight

How to retract an idea already pitched to an employer?

Using a found spellbook as a Sorcerer-Wizard multiclass

When conversion from Integer to Single may lose precision

Confusion about off peak timings of London trains

Can the poison from Kingsmen be concocted?

Russian equivalents of "no love lost"

Is it possible to 'live off the sea'

Can an Aarakocra use a shield while flying?

Facebook Marketing API asset access suddenly denied

How did they achieve the Gunslinger's shining eye effect in Westworld?

Is the term 'open source' a trademark?

GMRES vs Newton-GMRES for Solving nonlinear PDE's

Trapping Rain Water

Are there downsides to using std::string as a buffer?

How can drunken, homicidal elves successfully conduct a wild hunt?

Was the output of the C64 SID chip 8 bit sound?

How to build suspense or so to establish and justify xenophobia of characters in the eyes of the reader?

Is open-sourcing the code of a webapp not recommended?

Where does "0 packages can be updated." come from?

Compiling c files on ubuntu and using the executable on Windows

Why only the fundamental frequency component is said to give useful power?

What risks are there when you clear your cookies instead of logging off?

Magento Cloud : Fixing Merge Conflict

Magento 2 “There has been an error processing your request”Transfer multi-website content between staging and productionCan't add custom script (leaflet) to Contact pagehelp with magento cloudMagento Cloud Upload changes to master without re-deploy everything?Magento2 EE - Multi Language - CMS Page does not translated first timeHow could I purchase Magento Commerce Cloud?Accept payment fail when payment status is review in Magento2Magento 2.3.1 upgrade ErrorsMagento 2 Commerce Cloud acessing DB

.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty margin-bottom:0;

0

I am working on a project based on Magento Commerce Cloud.

I am trying sync code from master to Staging branch but i am getting failure message.And when i view the logs,i am seeing merge conflict w.r.t some files.

Can anyone please guide on how can i fix this

Thanks!

magento2 git magento2-cloud

share|improve this question

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

add a comment | 

0

I am working on a project based on Magento Commerce Cloud.

I am trying sync code from master to Staging branch but i am getting failure message.And when i view the logs,i am seeing merge conflict w.r.t some files.

Can anyone please guide on how can i fix this

Thanks!

magento2 git magento2-cloud

share|improve this question

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

add a comment | 

I am working on a project based on Magento Commerce Cloud.

I am trying sync code from master to Staging branch but i am getting failure message.And when i view the logs,i am seeing merge conflict w.r.t some files.

Can anyone please guide on how can i fix this

Thanks!

magento2 git magento2-cloud

share|improve this question

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

share|improve this question

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

share|improve this question

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

edited May 30 at 5:16

Muhammad Wasif

15311

edited May 30 at 5:16

Muhammad Wasif

15311

asked May 29 at 13:52

venkivenki

257

asked May 29 at 13:52

venkivenki

257

2 Answers
2

active

oldest

votes

0

Without knowing where you are and what's awaiting change I can only suggest something like this:

git checkout develop
git reset --hard
git fetch
git rebase
git checkout master
git reset --hard
git fetch
git rebase
git merge develop

If you still get conflicts you will have to manually work through them after this point.

Others will probably suggest merging master into develop and resolving conflicts on develop branch.

But without seeing the files and what's happening it's a best guess scenario.

share|improve this answer

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

add a comment | 

0

On your local machine merge master in to staging and then use your tool of choice to manually fix the merge conflict, then push to Magento Cloud. PHP Storm is great for this.

share|improve this answer

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

add a comment | 

Your Answer

StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "479"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);

else
createEditor();

);

function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: false,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: null,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);



);

draft saved

draft discarded

Sign up or log in

StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);

Sign up using Google

Sign up using Facebook

Sign up using Email and Password

Post as a guest

Name

Email

Required, but never shown

StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fmagento.stackexchange.com%2fquestions%2f276594%2fmagento-cloud-fixing-merge-conflict%23new-answer', 'question_page');

);

Post as a guest

Name

Email

Required, but never shown

0

Without knowing where you are and what's awaiting change I can only suggest something like this:

git checkout develop
git reset --hard
git fetch
git rebase
git checkout master
git reset --hard
git fetch
git rebase
git merge develop

If you still get conflicts you will have to manually work through them after this point.

Others will probably suggest merging master into develop and resolving conflicts on develop branch.

But without seeing the files and what's happening it's a best guess scenario.

share|improve this answer

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

add a comment | 

0

Without knowing where you are and what's awaiting change I can only suggest something like this:

git checkout develop
git reset --hard
git fetch
git rebase
git checkout master
git reset --hard
git fetch
git rebase
git merge develop

If you still get conflicts you will have to manually work through them after this point.

Others will probably suggest merging master into develop and resolving conflicts on develop branch.

But without seeing the files and what's happening it's a best guess scenario.

share|improve this answer

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

add a comment | 

Without knowing where you are and what's awaiting change I can only suggest something like this:

git checkout develop
git reset --hard
git fetch
git rebase
git checkout master
git reset --hard
git fetch
git rebase
git merge develop

If you still get conflicts you will have to manually work through them after this point.

Others will probably suggest merging master into develop and resolving conflicts on develop branch.

But without seeing the files and what's happening it's a best guess scenario.

share|improve this answer

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

git checkout develop
git reset --hard
git fetch
git rebase
git checkout master
git reset --hard
git fetch
git rebase
git merge develop

share|improve this answer

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

answered May 29 at 14:05

Dominic XigenDominic Xigen

97511

0

On your local machine merge master in to staging and then use your tool of choice to manually fix the merge conflict, then push to Magento Cloud. PHP Storm is great for this.

share|improve this answer

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

add a comment | 

0

On your local machine merge master in to staging and then use your tool of choice to manually fix the merge conflict, then push to Magento Cloud. PHP Storm is great for this.

share|improve this answer

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

add a comment | 

On your local machine merge master in to staging and then use your tool of choice to manually fix the merge conflict, then push to Magento Cloud. PHP Storm is great for this.

share|improve this answer

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

share|improve this answer

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579

answered May 29 at 14:28

Ben CrookBen Crook

9,5902579