| ... | ... | @@ -202,3 +202,7 @@ $ git remote add origin-push git@gitlab.haskell.org:ghc/haddock |
|
|
|
$ git push origin-push wip/my-changes
|
|
|
|
```
|
|
|
|
One can then push a GHC branch needing `wip/my-changes` and CI will find the commits. Note, however, that this is only for testing purposing. Before the GHC branch can be merged any submodule updates much be first merged upstream.
|
|
|
|
|
|
|
|
## Merging submodule changes
|
|
|
|
|
|
|
|
The CI pipeline of ghc/ghc> includes a linting step to ensure that all submodules refer only to "persistent" commits of the upstream repositories (e.g. not `wip/` branches, which may disappear in the future). Specifically, the linter checks that any submodules refer to commits that are reachable by at least one branch that doesn't begin with the prefix `wip/`. Consequently, you must ensure that any submodule changes introduced in a ghc/ghc> merge request are merged upstream before the merge request is added to the merge queue. |
|
|
\ No newline at end of file |
