Skip to content

Commit cfdbb8d

Browse files
committed
Updates CHANGELOG
1 parent e2785a4 commit cfdbb8d

File tree

4 files changed

+3
-0
lines changed

4 files changed

+3
-0
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
1010

1111
- Adds rebase and/or merge status when applicable to the _Commits_ and _Repositories_ views
1212
- **Merging into <branch>** or **Resolve conflicts before merging into <branch>** — lists any conflicted files. Conflicted files show comparisons with the common base of the current and incoming changes to aid in resolving the conflict by making it easier to see where changes originated
13+
![Merging](https://raw.githubusercontent.com/eamodio/vscode-gitlens/main/images/docs/commits-view-merge.png)
1314
- **Rebasing <branch>** or **Resolve conflicts to continue rebasing <branch>** — shows the number of rebase steps left, the commit the rebase is paused at, and lists any conflicted files. Conflicted files show comparisons with the common base of the current and incoming changes to aid in resolving the conflict by making it easier to see where changes originated
15+
![Merging](https://raw.githubusercontent.com/eamodio/vscode-gitlens/main/images/docs/commits-view-rebase.png)
1416
- Adds rebase and/or merge conflict status when applicable to the _File History_ and _Line History_ views
1517
- **Merge Changes** — show comparisons with the common base of the current and incoming changes to aid in resolving the conflict by making it easier to see where changes originated
18+
![Merging](https://raw.githubusercontent.com/eamodio/vscode-gitlens/main/images/docs/file-history-view-merge-conflict.png)
1619
- Adds status indicator colors to pull request icons in GitLens views
1720
- Adds a new _Quick Open File History_ command to all places where _Open File History_ already exists — closes [#1156](https://github.com/eamodio/vscode-gitlens/issues/1156)
1821
- Adds the _Add Remote_ command to the branch status in the _Branches_, _Commits_, and _Repositories_ views when there are no Git remotes configured

images/docs/commits-view-merge.png

17.5 KB
Loading
19.5 KB
Loading
16.3 KB
Loading

0 commit comments

Comments
 (0)