File tree 1 file changed +6
-5
lines changed
1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -137,13 +137,14 @@ Pull Request as you would in the normal flow.
137
137
What if you make changes in your repository and now want to push them upstream?
138
138
139
139
Assuming you just commited changes in the ` java-repo-tools/ ` directory of your
140
- ` my-main-branch ` , to merge the changes into the local ` java-repo-tools ` branch,
141
- we need to cherry pick this commit using the subtree strategy. It will ignore
142
- any changes to file not in the ` java-repo-tools/ ` directory .
140
+ ` my-main-branch ` , to split the ` java-repo-tools ` changes into their own branch.
141
+ The first time using the ` subtree ` command, we may need to use the ` --rejoin `
142
+ argument .
143
143
144
144
```
145
- git checkout java-repo-tools
146
- git cherry-pick -x --strategy=subtree my-main-branch
145
+ git subtree split --prefix=java-repo-tools -b java-repo-tools-update-from-java-docs-samples
146
+ git checkout java-repo-tools-update-from-java-docs-samples
147
+ git push java-repo-tools java-repo-tools-update-from-java-docs-samples
147
148
```
148
149
149
150
After you have committed all the changes you want to your ` java-repo-tools `
You can’t perform that action at this time.
0 commit comments