mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-29 11:02:08 +00:00
Update docs/en/development/contrib.md
Co-authored-by: Konstantin Bogdanov <thevar1able@users.noreply.github.com>
This commit is contained in:
parent
cfdc0cf7e7
commit
c3cd8ea97e
@ -31,7 +31,7 @@ If the library can be used as-is (the default case), you can reference the upstr
|
|||||||
If the library needs patching, create a fork of the upstream repository in the [ClickHouse organization on GitHub](https://github.com/ClickHouse).
|
If the library needs patching, create a fork of the upstream repository in the [ClickHouse organization on GitHub](https://github.com/ClickHouse).
|
||||||
|
|
||||||
In the latter case, we aim to isolate custom patches as much as possible from upstream commits.
|
In the latter case, we aim to isolate custom patches as much as possible from upstream commits.
|
||||||
To that end, create a branch with prefix `clickhouse/` from the branch or tag you want to integrate, e.g. `clickhouse/master` (for branch `master`) or `clickhouse/release/vX.Y.Z` (for tag `release/vX.Y.Z`.
|
To that end, create a branch with prefix `clickhouse/` from the branch or tag you want to integrate, e.g. `clickhouse/master` (for branch `master`) or `clickhouse/release/vX.Y.Z` (for tag `release/vX.Y.Z`).
|
||||||
This ensures that pulls from the upstream repository into the fork will leave custom `clickhouse/` branches unaffected.
|
This ensures that pulls from the upstream repository into the fork will leave custom `clickhouse/` branches unaffected.
|
||||||
Submodules in `contrib/` must only track `clickhouse/` branches of forked third-party repositories.
|
Submodules in `contrib/` must only track `clickhouse/` branches of forked third-party repositories.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user