annotate help/a-30.html @ 633:db62a0cb3037
* Added setting to specify that diff command should be run once for each selected file, rather than passing all file names to diff command (p4merge doesn't like being given many files)
| author |
Sam Izzo <sam@humbug.net> |
| date |
Mon, 27 Aug 2012 01:26:57 +1000 |
| parents |
b3309be1640f |
| children |
|
| rev |
line source |
|
Chris@498
|
1 <link rel="stylesheet" type="text/css" href="help.css"/>
|
|
Chris@498
|
2
|
|
Chris@498
|
3
|
|
Chris@498
|
4 <h2>I have committed some changes – how do I share them with my colleagues?</h2>
|
|
Chris@498
|
5
|
|
Chris@498
|
6 <p>There are two common general approaches:</p>
|
|
Chris@498
|
7
|
|
Chris@498
|
8 <p><a href="a-31.html">Permit your colleagues to “pull” your changes</a> directly from the local repository in your working folder, <i>or</i></p>
|
|
Chris@498
|
9
|
|
Chris@499
|
10 <p><a href="a-32.html">“Push” your changes to a shared remote repository</a> which you can all use as a master copy.</p>
|
|
Chris@498
|
11
|
