Skip to content

Commit 0517e9e

Browse files
committed
Demos added
1 parent 0acd732 commit 0517e9e

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# SharedLock - File modification guard for team development
1+
# SharedLock - File Modification Guard
22

3-
#### Used to acquire ownership of file(s) inside common project
3+
#### Used to acquire ownership of file(s) inside common to all team members project
44

55
[![Logo](./resources/icons/logo.png)](https://marketplace.visualstudio.com/items?itemName=code4bones.sharedlock)
66

7-
87
## Installation
98

109
Install from vscode marketplace [SharedLock](https://marketplace.visualstudio.com/items?itemName=code4bones.sharedlock).
@@ -17,5 +16,15 @@
1716

1817
## Demos
1918

20-
[![Demo](./resources/images/demo.gif)]
19+
![Demo](./resources/images/demo.gif)
20+
21+
22+
## How it works
23+
24+
For preventing merge confilicts while editing same file, developer can lock the file, so other team members
25+
cannot edit it, until first developer releases the file
26+
27+
This works inside identical project source tree ( i.e. cloned repo of same project, but doen't care abount branch),
28+
Locks works on [Workspace]/**/* files.
29+
2130

demo.gif

-846 KB
Binary file not shown.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "sharedlock",
33
"displayName": "SharedLock",
44
"description": "Sharing file locks in workspace files via network",
5-
"version": "0.2.7",
5+
"version": "0.2.8",
66
"publisher": "code4bones",
77
"icon": "resources/icons/logo.png",
88
"repository": {
@@ -68,28 +68,28 @@
6868
},
6969
{
7070
"command": "sharedlock.wipeLocked",
71-
"title": "Отпустить файлы",
71+
"title": "Wipe Owned Files",
7272
"icon": "resources/icons/wipe.png"
7373
},
7474
{
7575
"command": "sharedlock.lock",
76-
"title": "Занять файл"
76+
"title": "Lock File"
7777
},
7878
{
7979
"command": "sharedlock.unlock",
80-
"title": "Отпустить файл"
80+
"title": "Release File Lock"
8181
},
8282
{
8383
"command": "sharedlock.ctxUnlock",
84-
"title": "Отпустить файл"
84+
"title": "Release File Lock"
8585
},
8686
{
8787
"command": "sharedlock.ctxOpen",
88-
"title": "Открыть файл"
88+
"title": "Open File"
8989
},
9090
{
9191
"command": "sharedlock.toggle",
92-
"title": "Переключить владение"
92+
"title": "Toggle Lock"
9393
}
9494
],
9595
"views": {

sharedlock-0.2.8.vsix

3.19 MB
Binary file not shown.

0 commit comments

Comments
 (0)