-
Notifications
You must be signed in to change notification settings - Fork 587
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
Improved maintainability and reduced logical complexity #1136
Conversation
Hi @dukbong , there is a little conflict in the branch and I can't merge this. Can you rebase locally your changes? First update your master branch: git checkout master
git pull https://github.com/LibrePDF/OpenPDF.git master Optional: Squashing all your 15 commits into 1 is also a good idea, to do before you rebase, so rebasing will be less painful. Use your IDE for this. RebasingThen in you git checkout reduce
git rebase master As you have many commits, each one will be rebased onto master, so conflicts may arise and you must solve them. In this case git will tell, that it is still rebasing, but stop in a given commit. After you resolve the conflict, you may continue rebasing: git rebase --continue Do this untill all is rebase. After that you can force-push your branch again to GitHub, and your PR will be updated. git push --force Alternatively you may merge |
Thank you! @asturio ! I will soon make the changes following the instructions above. |
Quality Gate passedIssues Measures |
Description of the new Feature/Bugfix
Made changes to improve readability and reduce logical complexity, without introducing bug fixes or new features.
Related Issue: #
Unit-Tests for the new Feature/Bugfix
Compatibilities Issues
Since the modification reduces logical complexity, it does not introduce any compatibility issues.
Testing details
Since the modification only addresses reducing logical complexity, there are no additional details regarding testing.