Mercurial > hg-talk
view tasks/task-2 @ 9:e3783841a9ff
Move configs and tasks to subdirs
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Fri, 07 Nov 2014 12:28:04 -0500 |
parents | task-2@e7b19956f86d |
children |
line wrap: on
line source
For this second task, sign up on bitbucket and create a repository. * Upload your changes to this repository Useful commands =============== Adding more remote paths to your repo ------------------------------------- hg config --local Compare your repo with the remote --------------------------------- hg incoming hg outgoing Send and receive changes from the remote ---------------------------------------- hg pull hg push If you pull new changes, you may often also want to update. You can do both at once with hg pull --update hg pull -u * Work with someone else, and both of you push to this repo. One of you will be unable to push. In order to be able to push, you need to merge or rebase. Remember that a rebase is a merge in which you delete one commit. Useful commands =============== Merge the files with another revision ------------------------------------- hg merge Change what a commit is based on --------------------------------- hg rebase Mark files as being resolved or unresolved in a merge ----------------------------------------------------- hg resolve --mark hg resolve --unmark * After you resolve any conflicts, commit your merge and push it.