... | @@ -25,7 +25,7 @@ This is the structure in the upstream repo |
... | @@ -25,7 +25,7 @@ This is the structure in the upstream repo |
|
-- ...
|
|
-- ...
|
|
- Device-3\
|
|
- Device-3\
|
|
-- Files...
|
|
-- Files...
|
|
- Shared Files\
|
|
- Shared-Files\
|
|
-- File-4
|
|
-- File-4
|
|
-- ...
|
|
-- ...
|
|
```
|
|
```
|
... | @@ -60,8 +60,8 @@ __Solution__ |
... | @@ -60,8 +60,8 @@ __Solution__ |
|
```
|
|
```
|
|
4. Make and commit the changes that we want in **both** of our new repositories: removing the devices we are not interested in
|
|
4. Make and commit the changes that we want in **both** of our new repositories: removing the devices we are not interested in
|
|
```
|
|
```
|
|
|
|
git rm -r device-2
|
|
git rm -r device-3
|
|
git rm -r device-3
|
|
git rm -r device-4
|
|
|
|
git commit -am "Remove devices 3 & 4"
|
|
git commit -am "Remove devices 3 & 4"
|
|
```
|
|
```
|
|
5. This is the point at which our new repos will diverge, so we will make a new copy of this repo for the other device
|
|
5. This is the point at which our new repos will diverge, so we will make a new copy of this repo for the other device
|
... | @@ -70,10 +70,9 @@ __Solution__ |
... | @@ -70,10 +70,9 @@ __Solution__ |
|
cp new-device-1-repo/ new-device-2-repo/
|
|
cp new-device-1-repo/ new-device-2-repo/
|
|
cd new-device-1-repo
|
|
cd new-device-1-repo
|
|
```
|
|
```
|
|
6. Remove Device 2 directory
|
|
6. Remove Shared-Files directory
|
|
```
|
|
```
|
|
git rm -r device-2
|
|
git rm -r Shared-Files/
|
|
git rm -r device-4
|
|
|
|
git commit -am "Remove device 2"
|
|
git commit -am "Remove device 2"
|
|
```
|
|
```
|
|
7. Move Device 1 files to the top level
|
|
7. Move Device 1 files to the top level
|
... | | ... | |