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

[Tobias Quathamer]

On Sunday 12 April 2009 12:21:37 Alexis Darrasse wrote:
> On Sun, Apr 12, 2009 at 08:14:55AM +0200, Christian Perrier wrote:
> > I'd like to know what is the correct syntax if I want to merge the
> > master branch in debian branch, as Tobias does when preparign a
> > release. After all, who knows, I could have to make a release some
> > day..:-)
>
> $ git checkout debian
> $ git merge master
>
> That's all :)

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

Regards,
Tobias

-- 
Tobias Quathamer | Warning: Dates in calendar are closer than they appear.
Hamburg, Germany |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-isocodes-devel/attachments/20090413/40cdcf8f/attachment.pgp>