Skip to content
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

SYMBIAN: Minor fixes for comments and code. #3167

Closed
wants to merge 0 commits into from
Closed

SYMBIAN: Minor fixes for comments and code. #3167

wants to merge 0 commits into from

Conversation

@huhungahuru
Copy link

@huhungahuru huhungahuru commented Jul 18, 2021

Most of the corrections are from comments, a minor fix has been made to the code (Only a few lines were ordered).
These fixes apply to most Symbian files.

@digitall
Copy link
Member

@digitall digitall commented Jul 18, 2021

@huhungahuru : I assume that you are resubmitting this for review as you have finished the required changes. Firstly, could you use interactive rebase i.e. rebase -i and force push to remove the various merge commits and squash the various comment only changes into a single commit for SYMBIAN/SRC, SYMBIAN/BUILDER, KEYMAPPER, SDL, LOG etc.

@huhungahuru
Copy link
Author

@huhungahuru huhungahuru commented Jul 18, 2021

I don't have the knowledge to do that for now.

@digitall digitall closed this Jul 19, 2021
@digitall
Copy link
Member

@digitall digitall commented Jul 19, 2021

@huhungahuru : You should read the relevant parts of the git book on how to use rebase and branches to clean up a commit history into a set of logical changes prior to Pull Request:
https://git-scm.com/book/en/v2/Git-Branching-Rebasing

I have cleaned up your Pull Request commits and reordered them so that the SDL, LOG and KEYMAPPER change commits are separately from the SYMBIAN specific changes which I have squash down to a smaller number of logical commits and pushed this to this PR branch (sending a PR gives people with push access to the upstream repository the ability to edit your branch which you pushed from... hence why you should use a feature branch).

I did not specifically close this PR, but I think since you did this from the master branch, when I editted your commits it has caused Github to close this. I can't reopen this so you will need to resubmit this from the new fixed up commit as a new branch.

@digitall
Copy link
Member

@digitall digitall commented Jul 19, 2021

@huhungahuru : Ah, I think the push caused the reset of your master to even with scummvm:scummvm. I will push the fixed up commits to a branch and open a new PR... #3170

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants