Skip to content

Commit

Permalink
Update feature-branches.mdx (#12330)
Browse files Browse the repository at this point in the history
  • Loading branch information
adinauer authored Jan 14, 2025
1 parent 4b81e30 commit 374e8b1
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions develop-docs/sdk/miscellaneous/feature-branches.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 374e8b1

Please sign in to comment.