Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d73e142

Browse files
Merge pull request #22 from jjsilva4/branching-and-merging
Move auto-detection section
2 parents d7f9769 + 6bb8238 commit d73e142

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed
122 KB
Loading[フレーム]

‎_images/base-branch.png‎

151 KB
Loading[フレーム]

‎gitkraken-desktop/branching-and-merging.md‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Learn how to branch and merge in GitKraken Desktop. 🌳 🔀
1313
<iframe width='560' height='315' src='https://www.youtube.com/embed/8-qRKyy-v7I?rel=0&vq=hd1080' frameborder='0' allowfullscreen></iframe>
1414
</div>
1515

16+
Looking for a sharable summary? Learn about [how GitKraken solves merge conflicts](https://www.gitkraken.com/developer-problems/merge-conflicts).
17+
1618
***
1719

1820
## Branches
@@ -161,6 +163,24 @@ You may resolve a conflicted file by right-clicking the file in the commit panel
161163

162164
<img src='/wp-content/uploads/current-incoming.png' class='img-bordered img-responsive center'/>
163165

166+
***
167+
168+
## Automatic Conflict Detection (Preview)
169+
170+
GitKraken will monitor your base branch for conflicts and alert you with an icon in the toolbar when conflicts are detected, providing options to resolve your conflicts sooner rather than later.
171+
172+
<img src='/wp-content/uploads/Automatic-conflict-detection-GKD.png' class='img-bordered img-responsive center'/>
173+
174+
How it works:
175+
- When a conflict is detected, click on the icon in the toolbar to view details about the conflict. Choose to either rebase your current branch onto the base branch or merge changes from the base branch into your current branch.
176+
- Limit which branches GitKraken considers as "base branches" when scanning for conflicts by navigating to _Preferences > Conflict Detection_ to set the preferred branches for a repository.
177+
178+
<img src='/wp-content/uploads/base-branch.png' class='img-bordered img-responsive center'/>
179+
180+
This feature is currently in preview and may undergo significant updates based on feedback. [Share your thoughts](https://feedback.gitkraken.com) with us to help shape its future direction!
181+
182+
183+
164184
***
165185

166186
## Rebasing
@@ -178,12 +198,3 @@ You can rebase onto a local or remote.
178198

179199
<img src="/wp-content/uploads/select-rebase-sidebar.png" srcset="/wp-content/uploads/select-rebase-sidebar@2x.png" class="img-bordered img-responsive center">
180200

181-
***
182-
183-
## Automatic Conflict Detection (Preview)
184-
185-
GitKraken will monitor your base branch for conflicts and alert you with an icon in the toolbar when conflicts are detected, providing options to resolve your conflicts sooner rather than later.
186-
- When a conflict is detected, click on the icon in the toolbar to view details about the conflict and choose to rebase your current branch onto the base branch or merge changes from the base branch into your current branch.
187-
- You can limit which branches GitKraken may consider as "base branches" when scanning for conflicts. Navigate to _Preferences > Conflict Detection_ to set the preffered branches for a repository.
188-
- This feature is currently in preview and may undergo significant updates based on feedback. Share your thoughts with us to help shape its future direction!
189-

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /