Use git-merge to integrate dev branch