From 72466e75febd71d6900c6f3e0e403ea2a6764f25 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Wed, 18 Dec 2024 13:09:10 +0100 Subject: [PATCH] formatting --- .../sdk/platform-specifics/python-sdk/feature-branches.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/develop-docs/sdk/platform-specifics/python-sdk/feature-branches.mdx b/develop-docs/sdk/platform-specifics/python-sdk/feature-branches.mdx index 9af9e554b5686..7a2fbecbb8668 100644 --- a/develop-docs/sdk/platform-specifics/python-sdk/feature-branches.mdx +++ b/develop-docs/sdk/platform-specifics/python-sdk/feature-branches.mdx @@ -10,13 +10,13 @@ You might be tempted to branch off the feature branch and do the merge there, ma ## How to sync so that merge conflicts are recognized as resolved -…but you still get to see the nice GH diff and have CI run on your merge… +If you still want the nice GH diff and have CI run on your changes: - check out the feature branch and `git merge master` into it - solve conflicts (while still on the feature branch) - commit the merge (still on the feature branch) -- *(if you’re already confident all is good, you can just short circuit and push now, otherwise:)* +- *(if you're already confident all is good, you can just short circuit and push now, otherwise:)* - then open a new branch from your feature branch `git checkout -b sync-feature-with-master` - push the new branch, make a PR, look at the nice diff in GitHub, see if the tests pass -- if everything looks ok: don’t merge the PR! this will not mark the merge conflicts as solved +- if everything looks ok: don't merge the PR! this will not mark the merge conflicts as solved - instead, `git checkout` your feature branch (with the merge commit on top) and `push` it