Skip to content

Commit 4a90d97

Browse files
committed
Working with teams once-over.
1 parent 3987b34 commit 4a90d97

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

source/guides/working_with_teams.html.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Working with teams
22

3-
To effectively work with teams it is necessary to understand the interplay of
3+
To effectively work with teams it is necessary to understand the interdependence of
44
two CocoaPods files.
55

66
- `Podfile.lock`
@@ -18,32 +18,32 @@ Thanks to the `Podfile.lock` every machine which runs pod install on the
1818
hypothetical project will use RestKit 0.10.3 even if a newer version is
1919
available. CocoaPods will honor this version unless the dependency is updated
2020
on the Podfile or `pod update` is called. In this way CocoaPods avoids headaches
21-
caused to unexpected changes to dependencies.
21+
caused by unexpected changes to dependencies.
2222

2323
This file should always be kept under version control.
2424

2525
### Manifest.lock
2626

27-
If you use CocoaPods the `Pods` folder is not expected to be under source
27+
If you use CocoaPods the `Pods` folder, it is not expected to be under source
2828
control (as long as you trust the remotes which provide the sources for your
2929
Pods). The `Manifest.lock` stores the information of which version of Pod is
3030
installed in a specific Pods folder. It is a copy of the Podfile.lock at the
3131
time of the last installation on that machine.
3232

3333
### The big picture
3434

35-
Once an installation is invoked CocoaPods compares the Podfile to the
36-
Podfile.lock. If the installation was triggered by `pod install` all the
37-
versions of the non changed Pods are locked and thus will not be updated. Once
35+
Once an installation is invoked, CocoaPods compares the Podfile to the
36+
Podfile.lock. If the installation was triggered by `pod install` all the
37+
versions of the non-changed Pods are locked and thus will not be updated. Once
3838
the resolution process is completed CocoaPods will compare the resolved version
3939
of the Pods to the Pods/Manifest.lock in order to detect which Pods actually
4040
need to be installed.
4141

4242
### Note
4343

44-
Currently CocoaPods doesn't keep tracks of the specific checkout of Pods
45-
obtained through external sources and might create different installations
46-
across different machines if the external sources are not specific.
44+
Currently CocoaPods doesn't keep track of the specific checkout SHA of Pods
45+
obtained through external sources, which might create different installations
46+
across machines if the external sources are not specific.
4747

4848
For example, at the moment CocoaPods doesn't keep track of the commit SHA for
4949
the following dependency:

0 commit comments

Comments
 (0)