[Pkg-isocodes-devel] Merging master branch in debian branch?

[Christian Perrier]

Quoting Tobias Quathamer (toddy at debian.org):

> Correct. However, please remember to checkout the master branch afterwards, 
> otherwise you'll be committing changes meant for iso-codes to the debian 
> branch only. So the complete workflow should look like this:
> 
> $ git checkout debian
> $ git merge master
> [Edit files, e.g. debian/changelog for closing bugs]
> $ git commit
> $ git checkout master


Hmmm, have you checked whether I did any mistake yesterday ?

I *might* have committed things meant for master in debian....though
I'm unsure of this.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-isocodes-devel/attachments/20090413/d4b7d30c/attachment.pgp>