Gsyfuy

Python 3.6+ function to ask for a multiple-choice answer

Dukha vs legitimate need

Why aren't there more gauls like Obelix?

The past tense for the quoting particle って

What's the best tool for cutting holes into duct work?

Why would the IRS ask for birth certificates or even audit a small tax return?

PTiJ: How should animals pray?

Remove object from array based on array of some property of that object

Using the imperfect indicative vs. subjunctive with si

Problems with rounding giving too many digits

Sundering Titan and basic normal lands and snow lands

Why do we call complex numbers “numbers” but we don’t consider 2 vectors numbers?

“I had a flat in the centre of town, but I didn’t like living there, so …”

How do you make a gun that shoots melee weapons and/or swords?

Where is the fallacy here?

I've given my players a lot of magic items. Is it reasonable for me to give them harder encounters?

New invention compresses matter to produce energy? or other items? (Short Story)

Quitting employee has privileged access to critical information

Did Amazon pay $0 in taxes last year?

Ultrafilters as a double dual

An Undercover Army

School performs periodic password audits. Is my password compromised?

PTIJ: Aliyot for the deceased

Was it really inappropriate to write a pull request for the company I interviewed with?

Composer merge conflicts

0

We have a develop branch.

Every new feature gets created on a branch that runs off the develop branch.

Then a pull request is made to the develop branch.

This triggers our CI/CD and slowly but surely makes it way to the master branch and deployed live after all the quality checks and tests are validated.

Here's our issue:

• Developer1 creates a branch off develop for feature 1.




• Developer 2 creates a branch off develop for feature 2.




• Then, developer1 creates a pull request that includes an updated composer.json and composer.lock.




• His PR gets approved and merged.




• Then, developer2 tries to do a pull request to the develop branch but there's a conflict, because the composer.json and composer.lock were modified on the develop branch by developer1.

What's the best way to go about this?

Should developer2 first merge the develop branch back into his feature2 branch?

Or is there a better way of managing composer introduced merge conflicts?

composer git workflow

share

asked 57 secs ago

HaimHaim

1,193923

add a comment | 

0

We have a develop branch.

Every new feature gets created on a branch that runs off the develop branch.

Then a pull request is made to the develop branch.

This triggers our CI/CD and slowly but surely makes it way to the master branch and deployed live after all the quality checks and tests are validated.

Here's our issue:

• Developer1 creates a branch off develop for feature 1.




• Developer 2 creates a branch off develop for feature 2.




• Then, developer1 creates a pull request that includes an updated composer.json and composer.lock.




• His PR gets approved and merged.




• Then, developer2 tries to do a pull request to the develop branch but there's a conflict, because the composer.json and composer.lock were modified on the develop branch by developer1.

What's the best way to go about this?

Should developer2 first merge the develop branch back into his feature2 branch?

Or is there a better way of managing composer introduced merge conflicts?

composer git workflow

share

asked 57 secs ago

HaimHaim

1,193923

add a comment | 

We have a develop branch.

Every new feature gets created on a branch that runs off the develop branch.

Then a pull request is made to the develop branch.

This triggers our CI/CD and slowly but surely makes it way to the master branch and deployed live after all the quality checks and tests are validated.

Here's our issue:

• Developer1 creates a branch off develop for feature 1.




• Developer 2 creates a branch off develop for feature 2.




• Then, developer1 creates a pull request that includes an updated composer.json and composer.lock.




• His PR gets approved and merged.




• Then, developer2 tries to do a pull request to the develop branch but there's a conflict, because the composer.json and composer.lock were modified on the develop branch by developer1.

What's the best way to go about this?

Should developer2 first merge the develop branch back into his feature2 branch?

Or is there a better way of managing composer introduced merge conflicts?

composer git workflow

share

asked 57 secs ago

HaimHaim

1,193923

share

asked 57 secs ago

HaimHaim

1,193923

share

asked 57 secs ago

HaimHaim

1,193923

asked 57 secs ago

HaimHaim

1,193923

asked 57 secs ago

HaimHaim

1,193923