-
Notifications
You must be signed in to change notification settings - Fork 60
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
No commit history from upstream #7
Comments
Also:
It's the little things that count :) P.s. regarding upstreaming the code, on the Diasurgical Discord channel, we have been talking about how to coordinate upstreaming the controller code and eventually the port. Some of it will be in the form of code clean up in this repo as far as getting the code more cross-platform and solving issues that affect the switch port as is. Once that is done we will see what is left and how best to proceed. |
It appears that the branching point was diasurgical/devilutionX@e6f4e21, some this commit there are only 62+/702- lines of difference to f217513 (the original commit in this repo). |
I have now rebased the devilution-nx fork on upstream master the PR can be found here: diasurgical/devilutionX#181 |
The port has now been fully upstreamed, here are some of the fixes that has been made:
@lantus please change this repo into a propper GitHub fork so that we can get credit and easily merge future improments. (Automatic widescreen support is just around the corner) |
We have enow release 1.1.0 upstream, this includes widescreen support which looks pretty great on the Switch I'm told :) |
Could you maybe rebase on upstream and apply your commits again so we get full commit history? I think if you made a new branch, rebased the branch on upstream, and cherry picked your commits. Then force pushed it into master, you would have done it successfully, restoring lost history, for the benefit of mankind.
Benefits:
The text was updated successfully, but these errors were encountered: