On 3/24/2016 4:21 PM, William Marshall wrote:
Could just deleting and recreating the branch work?
That's what I'm trying now.
I suspect if you do that, we will need to have INFRA reset our working
copy. See this old issue when someone created a new branch.
https://issues.apache.org/jira/browse/INFRA-9886
To be very clear, I'm going to try making a new orphan branch, and copying
over all of the changesets from the asf-site tree. So something like:
git checkout --orphan newTree
git cherry-pick <commit 1 from asf-site branch>
...
git cherry-pick <commit n from asf-site branch>
git checkout asf-site
git reset --hard newTree
git push -f origin asf-site
This way, we can preserve commit history.
I don't know enough about git to say if that is the right thing.
Probably commit history on asf-site is not so important.
