Sun, 15 Oct 2023 21:04:58 +0000, /Joseph Kesselman/:
Valid point.
So what's easiest way to fix? Check out from before the info was lost,
merge changes from head into that, then force-replace head with the
result of that merge?
I've previously suggested PR #14. While there are other ways to achieve
the same (or similar) effect, all of them require some understanding of
Git workings – as I've noted in that PR description:
Note, this PR should not be merged from Github's web UI...
Then I'm not the one to do it but one that has push access to the main
repository. That one should understand what is been done.
Further, your latest work in PR #101 needs to be rebased or squashed on
merge – plain merge from you current base would "wipe" the history over,
after PR #14 been integrated. That is it will restore the state of
"missing" history.
I suggest the exact approach to be taken should be clarified and agreed
upon by the project maintainers (as they'll have to do it), first.
Whether it would be PR #14 or another possibility I've noted in
XALANJ-2671 – it requires clear understanding of the effects of various
Git operations.
– Stanimir
From: Stanimir Stamenkov
Sent: Sunday, October 15, 2023 1:30:48 PM
Vladimir Sitnikov created XALANJ-2671:
-----------------------------------------
Summary: Source code history lost in "clearing all contents" +
"updating master branch, to have same contents as..." commits
Key: XALANJ-2671
URL: https://issues.apache.org/jira/browse/XALANJ-2671
I want to point out this has not been resolved yet, and after:
* https://github.com/apache/xalan-java/pull/101
gets merged into master, it would be virtually impossible to address it
further. See also:
* https://lists.apache.org/thread/51rlblc6mfhxopszjlj12bzswodb0vb4
* https://github.com/apache/xalan-java/pull/14
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org
For additional commands, e-mail: dev-h...@xalan.apache.org
