Skip to content

Commit a412e9c

Browse files
committed
Update README
1 parent 456754c commit a412e9c

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Readme.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ git pull origin master
295295
git checkout -b subtree-update_cg_gcc_YYYY-MM-DD
296296
PATH="$HOME/bin:$PATH" ~/bin/git-subtree pull --prefix=compiler/rustc_codegen_gcc/ https://github.com/rust-lang/rustc_codegen_gcc.git master
297297
git push
298+
299+
# Immediately merge the merge commit into cg_gcc to prevent merge conflicts when syncing from rust-lang/rust later.
300+
PATH="$HOME/bin:$PATH" ~/bin/git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name
298301
```
299302

300303
TODO: write a script that does the above.

0 commit comments

Comments
 (0)