Skip to content

Commit ef6085f

Browse files
committed
Address review comments
1 parent 15623fb commit ef6085f

File tree

1 file changed

+2
-2
lines changed
  • docs/testing-deployment-publishing/branching-collaboration

1 file changed

+2
-2
lines changed

docs/testing-deployment-publishing/branching-collaboration/branching.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ When you merge `Branch B` into `Branch A`, Git compares:
533533
- What changed in `Branch A` since the common starting point.
534534
- What changed in `Branch B` since the common starting point.
535535

536-
If both of you changed different parts, Git can merge them easily. But if you both changed the same part in different ways, Git won’t know which one to keepthat's called a conflict, and you'll need to resolve it manually.
536+
If both of you changed different parts, Git can merge them easily. But if you both changed the same part in different ways, Git won’t know which one to keep, that's called a conflict, and you'll need to resolve it manually.
537537

538538
![git-merging-behavior](imgs/git-merging-behavior.avif)
539539
</p>
@@ -547,7 +547,7 @@ Here are a few other things to know:
547547
</ul>
548548
<p>
549549

550-
For example, you merge `Branch B` into `Branch A`, and `change C` gets copied over. Later, you decide to undo `change C` directly on `Branch A`. Now, if you merge `Branch B` into `Branch A` again, Git will not re-flag `change C` as a difference. This is because Git considers it already merged and no longer a diff.
550+
For example, you merge `Branch B` into `Branch A`, and `change C` (which exists in `Branch B`) gets copied over to `Branch A`. Later, you decide to undo `change C` directly on `Branch A`. Now, if you merge `Branch B` into `Branch A` again, Git will not re-flag `change C` as a difference. This is because Git considers it already merged and no longer a diff.
551551

552552
</p>
553553
<p>

0 commit comments

Comments
 (0)