> Also, how will we proceed when we will consider that this automake > migration is ready for merge into master? The normal process would > be to squash all the commits into a single one on master, but given > the high number of files impacted, it might be better to have all > the commits into master? In this case should I need to add a entry > in ChangeLog per commit on automake3?
IMHO, your changes are too large for a detailed ChangeLog entry. Instead, I recommend that you simply merge your branch back into master, leaving your single commits intact. The merge should be accompanied with a ChangeLog entry that gives an overview of what the commits in the branch do. > Also, I will need to change the dates of the commits (currently the > first commit related to automake on `automake3', which comes after > the most recent commit in master, is dated in August). Why do you want to change commit dates? I don't see a problem here. Werner
