A lot of the following steps assume you move back and from from in the develop-trunk directory.  It may make more sense to preface those steps with:
- Change to the develop-trunk directory:
cd develop-trunk

Then the merges can omit the -d option.