I think I forgot to -squash or rebase-i. Apologies.
Git often reminds me of the Frances Sternhagen quote from _Outland_:
"Such a smart piece of equipment, and a wreck like me trying to run it. "
On 7/14/2023 11:51 AM, Joseph Kessselman wrote:
Went to Gitbox and selected the ASF Boxer Service. Logged in. It said
I hadn't yet authenticated with GitHub.
Went through that sequence. Boxer says accounts are now linked.
Alas, still not seeing controls for merge approval on the git hub web
view of the PR, where I'm used to having them appear.
However, I *think* I've successfully done a merge on my change request
from the CLI, by using
git remote add -f changes https://github.com/jkesselm/xalan-test.git
git merge changes/master --allow-unrelated-histories
(confirm no conflicts)
git push
git diff origin/master
git diff changes/master
(diffs say local now matches both)
(web view says PR has been merged)
I *think* that makes sense, though it's not the way I'd prefer to do
it. If I've made a mess, and/or if there's a better solution, please
let me know!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org
For additional commands, e-mail: dev-h...@xalan.apache.org
