Skip to content

Commit 374e8b1

Browse files
authored
Update feature-branches.mdx (#12330)
1 parent 4b81e30 commit 374e8b1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

develop-docs/sdk/miscellaneous/feature-branches.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ If you still want the nice GH diff and have CI run on your changes:
2323

2424
## Alternative solution A (used for Java SDK `8.x.x` branch)
2525

26+
This does not show the full history on each file. The history only works on the full repo. Please try another method.
27+
2628
- Create a PR for merging `main` into `8.x.x`
2729
- 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`
2830
- 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

0 commit comments

Comments
 (0)