diff --git a/develop-docs/sdk/miscellaneous/feature-branches.mdx b/develop-docs/sdk/miscellaneous/feature-branches.mdx index 636305e78ea6e6..a701e3b97aac9d 100644 --- a/develop-docs/sdk/miscellaneous/feature-branches.mdx +++ b/develop-docs/sdk/miscellaneous/feature-branches.mdx @@ -23,6 +23,8 @@ If you still want the nice GH diff and have CI run on your changes: ## Alternative solution A (used for Java SDK `8.x.x` branch) +This does not show the full history on each file. The history only works on the full repo. Please try another method. + - Create a PR for merging `main` into `8.x.x` - Once that PR is merged into `8.x.x` there will still be conflicts shown in the PR for merging `8.x.x` back to `main` - Do another merge of `main` into `8.x.x` where you accept all changes on the `8.x.x` branch and create an empty merge commit