Op 2-3-2020 om 17:15 schreef Dick Groskamp:
As some of you probably noted I've accidently messed up GitHub with a
lot of Pull Requests.
I spent last week reading and googling on how to resolve that.
I failed.
I do have Git set up and do have a fork on GitHub.
Everything goes well .....until I make a Pull Request to have the
changes be incorporated
in Apache OpenOffice/trunk.
The PR collects all commits I've made and puts them in the PR, even
the unwanted ones.
I haven't found any possibility to fix that.
I do have all my changes locally. (concerns solely fixes in
Helpcontent2 in tags <bookmark_value> and typo's)
[PROPOSAL]
To avoid further cluttering on the Pull Requests on GitHub I propose
to close them all.
None of the changes have yet been merged so closing them will have no
influence on /trunk.
Any thoughts ?
After some Cherry-picking and Rebasing I managed to get all the separate
commits (>20) into one.
commit 97a1911f333e8e743f083780d3b1eb0c0ea6a5ec
Made a new PR and closed the PR's that were opened and that are now
obsolete.
--
DiGro
___________________________
Apache OpenOffice 4.1.7 (Dutch) and scanned with Ziggo Safe Online (F-Secure)
