Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release v0.2.0 #11

Merged
merged 1 commit into from
Jan 24, 2024
Merged

chore: release v0.2.0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .changeset/twelve-knives-sit.md
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# lockfile-conflicts

## 0.2.0

### Minor Changes

- 3448c0b: chore: refactor initialization process
- use bin instead of npx command
- remove git config first before set
- add config directory exist judge logic

## 0.1.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lockfile-conflicts",
"version": "0.1.1",
"version": "0.2.0",
"type": "module",
"description": "A custom merge driver, aims to handle lockfile conflicts automatically in merge/rebase process.",
"author": "秦旭洋 <emosheep@qq.com>",
Expand Down
Loading