Mercurial > hg > easyhg
comparison help/topics.html @ 532:06507a59f2b8 easyhg_v1.1
This will do for the Merge topic
| author | Chris Cannam |
|---|---|
| date | Wed, 23 Nov 2011 17:24:47 +0000 |
| parents | f56e5c39aad1 |
| children | 2c106ea908b5 |
comparison
equal
deleted
inserted
replaced
| 531:f56e5c39aad1 | 532:06507a59f2b8 |
|---|---|
| 18 <h3>Sharing changes</h3> | 18 <h3>Sharing changes</h3> |
| 19 <p><a href="a-30.html">I have committed some changes – how do I share them with my colleagues?</a></p> | 19 <p><a href="a-30.html">I have committed some changes – how do I share them with my colleagues?</a></p> |
| 20 <p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p> | 20 <p><a href="a-31.html">I want to let my colleagues pull changes directly from my local repository</a></p> |
| 21 <p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p> | 21 <p><a href="a-32.html">I want to put my changes into a master repository shared with my colleagues</a></p> |
| 22 <p><a href="a-33.html">I tried to push my changes, but it told me “the remote repository may have been changed by someone else” and refused</a></p> | 22 <p><a href="a-33.html">I tried to push my changes, but it told me “the remote repository may have been changed by someone else” and refused</a></p> |
| 23 <p><a href="a-34.html">How do I use this Merge window?</a></p> | 23 <p><a href="a-34.html">How do I use the Merge window?</a></p> |
| 24 <h3>See also</h3> | 24 <h3>See also</h3> |
| 25 <p><a href="a-40.html">Video tutorials</a></p> | 25 <p><a href="a-40.html">Video tutorials</a></p> |