Skip to content

Commit d6cb66c

Browse files
committed
Some text cleanup
1 parent 502f245 commit d6cb66c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

git/view-merge-conflicts.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ date: 2024-05-29
55
# View the conflicts resolved in a merge commit
66

77
Today I learned that [in Git 2.36](https://github.blog/2022-04-18-highlights-from-git-2-36/#review-merge-conflict-resolution-with-remerge-diff), the `--remerge-diff` option was added to `git show`.
8-
9-
This effectively let's you view any merge conflicts that ocurred during a merge commit and how they were resolved.
8+
This effectively lets you view any merge conflicts that occurred during a merge commit and how they were resolved.
109

1110
So for instance, `git show --remerge-diff <commit-message-id>` would show something like:
1211

1312
![terminal screenshot of git show output](view-merge-conflicts.png)
1413

15-
Under the hood it recreates the merge with the conflicts and diffs it with the merge commit so the conflict markers are shown in red since the merge commit removes the conflict markers during resolution.
14+
Under the hood, it recreates the merge with the conflicts and diffs it with the merge commit so the conflict markers are shown in red since the merge commit removes the conflict markers during resolution.
1615

javascript/array-with.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ I just discovered the `with()` method which takes an index value and a value to
99
``` javascript
1010
const arr = [1, 2, 3, 4, 5];
1111
const newArr = arr.with(2, 'a');
12-
console.log(newArr); // [1, 2, 'a', 3, 4, 5]
12+
console.log(newArr); // [1, 2, 'a', 4, 5]
1313
```
1414

15-
You could definitely do this before with something like `arr[2] = 'a'` but that would modify the original array
15+
You could do this before with something like `arr[2] = 'a'` but that would modify the original array.
1616

1717
The `with()` method became widely supported in 2021.
1818

0 commit comments

Comments
 (0)