diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2008-05-19 01:04:36 +0200 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2008-05-19 01:04:36 +0200 |
| commit | 87e53c131e6d244047c22406ca376320e27a3fde (patch) | |
| tree | 56dba820cf116a0f19db1b47ca7b49ea673e6480 | |
| parent | ad0950d99e7bc11f32257263304e74ed9313ba34 (diff) | |
Suggest to fetch and rebase instead of pull.
| -rw-r--r-- | contributing/wiki.mdwn | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contributing/wiki.mdwn b/contributing/wiki.mdwn index 7f70ae91..02911965 100644 --- a/contributing/wiki.mdwn +++ b/contributing/wiki.mdwn @@ -99,7 +99,10 @@ is also read-only. For all cases: if you omit `[dest]` it will default to `wiki`. Later, you can just `cd` into the `wiki` directory and run a `git pull` to get -hold of the latest changes others have been installing in the mean time. +hold of the latest changes others have been installing in the mean time. (Even +better would be to do a `git fetch`, followed by a `git rebase origin/master` +to avoid those *Merge branch ...* messages. See the git documentation for +details.) But now: work on these files. |