Have a PR (new binding), #6457, which was created prior to OH 2.5 release. Made some changes to source code, and also did a rebase to OH master after 2.5 release, thus having PR commits based on master from after 2.5 release.
After creation of 2.5.x branch, I switched PR to branch 2.5.x and had to do git reflog / hard reset of my branch to the initial commit, prior to 2.5 release. Did a rebase to 2.5.x branch, and revised/committed latest source code, and my PR was ok again (without conflicts).
However, with the raise of OH 2.5.2 my PR had conflicts. Attempted to do a direct rebase from latest commit, but ended up with a strange sequence of commits. Tried once again to git reflog / hard reset to initial commit, rebase branch and revise/commit source code, although ended with a trail of commits following my PR (current “as is” status).
Also started out to create a new branch to perform hard reset against, i.e. pull 2.5.x branch, create new binding skeleton, and copy latest source code. Although, when trying to commit to the new branch, my committed files was noted as “create mode 100644” or “create mode 100755”, apparently related to file permissions, so aborted commit.
Development enviroment: Mac OS.
Any hints to fix PR? Both Travis build and Jenkins build have run with success, but I do have “Files changed” belonging to the trail of following commits.