Resolved merge conflict

[debcargo-conf.git] / release.sh

diff --git a/release.sh b/release.sh
index ee218ea54edf5a02b2a66aa1281c67fe7882cd80..e5dd78858dad08aa401f3a4e66da050fcbfc2cb4 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -206,7 +206,7 @@ new binaries, then you can just go ahead and directly dput the source package.
 
 If you want to build and test it, run:
 
-  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge -
+  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge - && cd -
 
 For your reference, this source package builds $(echo "$upload_bin_packages" | wc -l) binary package(s):
 $upload_bin_packages