From 5f4b1948420011b74d8b8d9c96c63d0b04f242cd Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 26 Sep 2008 20:01:27 +0200 Subject: [PATCH] update merging new upstream --- debian/README.source | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/README.source b/debian/README.source index c943498..56556aa 100644 --- a/debian/README.source +++ b/debian/README.source @@ -79,14 +79,13 @@ TopGit. 5. Importing a new upstream version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To import a new upstream, pull it into the upstream branch, merge upstream +To import a new upstream, update the remote, merge the tag you want to merge into the master branch, ideally together with an update to debian/changelog, then update all TopGit branches: -1. git checkout upstream -2. git pull -3. git checkout master -4. git merge upstream +1. git remote update +2. git checkout master +3. git merge topgit-0.4 Now proceed as in the next step. -- 2.30.2