How do you manually make merge every single file by selecting the necessary version in each case?



  • Dano:

    Master ' s panels: A-Conference C-national B, test: A-State C; File X changed and B and C differently.

    Objective:

    Get in master file X as a commite. C

    Problem:

    When the nets are merged, file X is produced in the commite version B

    Question:

    How can Irge manually choose the version of the file/line in the file, i.e. redefining default behaviour?



  • Your problem is the test is the parent for the master. All test commies are already in the master's office, and the merger operation doesn't do anything.

    What you need isn't called merger, it's a "sampling of the file." In gita, this is one of the checkout team forms:

    git checkout test (путь к файлу)
    

    Documentation: https://git-scm.com/docs/git-checkout


Log in to reply
 


Suggested Topics

  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2
  • 2