how to migrate multiple branches of a subfolder to another repo with git subtree -

-

I want to migrate to a subfolder with the entire history of the repository 1: 

  a ->; B - & gt; C (branch 1) \ - & gt; D (branch 2)

repository in the same target folder 2: 

  old - & gt; Merged _sub folder (master) / a * - & gt; B * - & gt; C * (branch 1) \ - & gt; D * (branch 2)

with * subfolders denote the boundary.

So far I 

  git subtree Split -P subfolder B Shakhaan- git subtree Split -P subfolder B Shakhaoteepitititiaiteepitimapi -P Lcshy_folder Ripoiiai Shakhai

then I made in branch b 2 * 2, but 

  Jiaiti add subtitles drink ./ repo_1 branch_2

does not work Is because 

  prefix './' already exists

any suggestions for resolving the problem?

And later, how to merge into the repository with 2 in Master 2?

-b option to git subtitle split Specify a new branch to be created in which you have created two new branches, branch_1 and branch_2 , to create history from the new history, not the branch, in which both of you There is a new history for the branch in which you were presently.

Then I branch created 2 b b * in the repository 2

It has no effect Add git subtree a repository Receives a committed and its history and merges it into the present branch; It does not see other branch names at all.

The prefix './' already exists.

You can not add a subtitle for it. Existing directory without adding a sub-section of the merged will be only a common object; You can still explicitly add (and merge) sub-projection and can return the merge later. In summary, to complete the migration: 

  # 1 git repository in subtree Split -P Sbfolder- B Shakha_l_ni Shakha_l Jiaiti subtree 2 Jiaiti subtree Split -P subfolder B Shakha_2_anu Shakha_2 # repository Ed -P target_folder repo_1 branch_2_nu git branch branch 2 HEAD ^ 2 git reset - hard head ^ git subtitle add-p target_folder repo 1 branch_1_nu if you later did the other branch in the main project Micro decide to merge,  
  git subtree merge -P target_folder branch_2     / code> 
 < / Div>

Comments

Post a Comment

Popular posts from this blog

import - Python ImportError: No module named wmi -

-
I followed the instructions for downloading WMI for Python When I try to run the code for C.Win32_Service (StartMode = "Auto", state = "Stopped") import wmi c = wmi.WMI (): if Raw_input ("restart% s?"% S.Caption) .upper () == "Y": s.StartService () I got the error < Code> traceback (most recent call end): file ". \", Line 1, edit: I am using Python 2.7.6 EDIT2: I am running 64-bit Windows 2008 R2, and I've downloaded WMI-1.4.9.zip (md5). I removed the content and put it in D: Python \ Tools \ Scripts I executed dragon setup.py.install I said D : \ Python \ tools \ scripts to% PATH% and when I execute the code for C.Win32_Service (StartMode = "Auto", state = "Stopped") import wmi c = Wmi.WMI (): If raw_input ("Restart% s?"% S. Caption). () == "Y": s.StartService () error me Gets traceback (most recent call final): File ". See \", line 1, &
Read more

Editing Python Class in Shell and SQLAlchemy -

-
I am working on the terminal on a shell script after this tutorial SQLAlchemy tutorial. I need to type gt; & Gt; & Gt; Sqlalchemy import column, integer, string & gt; & Gt; & Gt; Class user (base): __tablename__ = 'users' id = column (integer, primary_key = true) name = column (string) absolute name = column (string) password = column (string) def __repr __ (self): return "& lt ; User (name = '% s', absolute name = '% s', password = '% s') & gt; "% (Self.name, self.fullname, self.password) After the problem I have typed the password = column (string) I hit twice and changed .... >> I then took everything back but then an error was thrown because the class already exists ... I am not completely sure how to fix it. How do I open that slip in the shell script and edit it (Add DF to DRR) The error thrown below: / user / giripeters / TFSQLLX / Lib / python2.7 / site-packages / sqlalchemy / ext / decla
Read more

c# - MySQL Parameterized Select Query joining tables issue -

-
I am using parameterized select questions in conjunction with my program and it works entirely, When I try to join the table Everything I have done is a small fraction: using (MySqlCommand cmd = new MySqlCommand (paramQuery) ToSql (), Connection)) /etc/ paramQuery.ToSql () Equal: "Select TableOne ID, Tableon, Department, Tablet. One by name table, Table 2 h Yes TableOnEID = @Pharmak "* / for (Int Index = 0; Index and Lt; ParamariX Parameter (.c calculation; Index ++) Cmd.Parameters.AddWithValue (paramQuery.Parameters (). ElementAt (index). , ParamQuery.Parameters (). ElementAt (index) .Value); / * ParamQuery.Parameters (). ElementAt (index) .k = "@most 0" paramQuery.Parameters (). ElementAt (index) .Value = "tableTwo.ID" * / MySqlDataReader Reader = cmd.ExecuteReader (); While (reader.Read ()) {// do stuff} } One of the tables I attempt to join is For the table, two with the same id for all. Is there something that I'm doing wrong?
Read more