We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 456754c commit a412e9cCopy full SHA for a412e9c
Readme.md
@@ -295,6 +295,9 @@ git pull origin master
295
git checkout -b subtree-update_cg_gcc_YYYY-MM-DD
296
PATH="$HOME/bin:$PATH" ~/bin/git-subtree pull --prefix=compiler/rustc_codegen_gcc/ https://github.com/rust-lang/rustc_codegen_gcc.git master
297
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
301
```
302
303
TODO: write a script that does the above.
0 commit comments