scripting - Git folder with files from two different branches -


I just explain my scenario.

I have a folder in which git is managed with scripts that are running automatically Each script has a related filter file, which determines which files in response to different incidents Will have to run. Example:

  • a.script
  • a.filter
  • b.script
  • b.filter < / Ul>

    I have a branch in which there are some changes in scripts, but we have decided to roll them for certain scenarios at the moment.

  • a.philter
  • So we will end up with something:
    • a.script
    • a_.script
    • Li>

      So I need that script files from the main branch, and the script files from the test branch are checked out in a folder together with different names. I do not know when (or) the test branch will be merged into the main, then I have to push the changes in both the branches. Do you have any additional or modified files already, there is a good way to think that GIT Using?

      test ); This branch should contain files from the Master branch (as it was made from master , right?). Now create a third branch, e.g. Local (or integrated or whatever): 
        git checkout -b local master   
       Merge the branch in your  test  now:  
        git merge test   
       This lets you basically all of the branches The modifications should be given. Note that this branch is not for manually depositing, you can only merge into your  master  or your  test  branch, always keep going to those branches ,  local  any time!  
       This approach requires little discipline because you should not take the  local  branch (unless you believe that you do not have to do  ribbase ).  local  branch should be sent to the branch and really should go). Also, this will be very confusing in  gitk  because there is a continuous merge in a branch to produce some optical noise. It can be cleared by repeating two steps from every now and then up to the top, which happens only with the reconstruction of the  local  branch; This is not a problem because all your changes are either committed to  master  or  test .

Comments

Post a Comment