Merge branch 'master' into feature/support-worktree

Author: StanleyGoldman

docs/using/images/locked-scene.png

@@ -0,0 +1,30 @@
+# Locking files
+
+## Request locks
+
+From the Project tab, right-click on a file to open the context menu and select `Request Lock`.
+<img src="images/request-lock.png"/>
+
+An additional way to lock a file is by selecting it and going to `Assets` -> `Request Lock`.
+
+## View locks
+
+After requesting a lock, a lock icon appears in the bottom right-hand corner of the file.
+<img src="images/locked-scene.png"/>
+
+A list of all locked files will appear in the **Locks** view in the GitHub tab.
+<img src="images/locks-view.png"/>
+
+## Release locks
+
+There are three ways to release locks:
+
+1. From the Project tab, right-click on the locked file to open the context menu and select the option to `Release Lock`.
+<img src="images/release-lock.png"/>
+
+2. From the GitHub tab under the **Locks** view, right-click to open the context menu and select to `Release Lock`.
+<img src="images/locks-view-right-click.png"/>
+
+3. Select the file to unlock and go to select the menu option `Assets` -> `Release Lock`.
+
+Note: There are also two options for how to release a lock on a file. Always choose the `Release Lock` option first. The `Release Lock (forced)` option can be used to remove someone else's lock.