Composer merge conflicts

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?









share



























    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?









    share

























      0












      0








      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?









      share














      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












      share










      share



      share










      asked 57 secs ago









      HaimHaim

      1,193923




      1,193923






















          0






          active

          oldest

          votes











          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


















          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fmagento.stackexchange.com%2fquestions%2f264947%2fcomposer-merge-conflicts%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown

























          0






          active

          oldest

          votes








          0






          active

          oldest

          votes









          active

          oldest

          votes






          active

          oldest

          votes
















          draft saved

          draft discarded




















































          Thanks for contributing an answer to Magento Stack Exchange!


          • Please be sure to answer the question. Provide details and share your research!

          But avoid



          • Asking for help, clarification, or responding to other answers.

          • Making statements based on opinion; back them up with references or personal experience.


          To learn more, see our tips on writing great answers.




          draft saved


          draft discarded














          StackExchange.ready(
          function () {
          StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fmagento.stackexchange.com%2fquestions%2f264947%2fcomposer-merge-conflicts%23new-answer', 'question_page');
          }
          );

          Post as a guest















          Required, but never shown





















































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown

































          Required, but never shown














          Required, but never shown












          Required, but never shown







          Required, but never shown







          Popular posts from this blog

          “%fieldName is a required field.”, in Magento2 REST API Call for GET Method Type The Next...

          How to change City field to a dropdown in Checkout step Magento 2Magento 2 : How to change UI field(s)...

          變成蝙蝠會怎樣? 參考資料 外部連結 导航菜单Thomas Nagel, "What is it like to be a...