checkpoint before merging upstream
pop quilt patches and then checkpoint