[tei-council] git help

So I've let the branch I'm using to work on the @minOccurs @maxOccurs bug lay fallow for a bit too long now. I'd like to merge the changes that have been made to the 'dev' branch since I created the 'sydb-occurs' branch into that branch. Can someone remind me how to do that? Thanks.