You can just merge ams-branch to HEAD, will save you alot of
work. It still contains a slew of patches and bug fixes that
have not been commited.These patches and fixes have to be considered one by one. If they have been put together in one branch, that means he has to disentangle them in order to consider them. They were already considered one by one, so that job is already done.
