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

Improved maintainability and reduced logical complexity #1136

Merged
merged 15 commits into from
Apr 11, 2024

Conversation

dukbong
Copy link
Contributor

@dukbong dukbong commented Apr 9, 2024

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

  • Unit-Tests added to reproduce the bug
  • Unit-Tests added to the added feature

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.

@dukbong dukbong changed the title Reduce Improved maintainability and reduced logical complexity Apr 9, 2024
@asturio
Copy link
Member

asturio commented Apr 10, 2024

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.

Rebasing

Then in you reduce branch you can rebase it onto your master-Branch:

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 master into your reduce branch, which is also ok. Here no need to force-push. Push only will be ok.

@dukbong
Copy link
Contributor Author

dukbong commented Apr 10, 2024

Thank you! @asturio ! I will soon make the changes following the instructions above.

Copy link

sonarcloud bot commented Apr 10, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@asturio asturio merged commit dfbdda2 into LibrePDF:master Apr 11, 2024
7 checks passed
@dukbong dukbong deleted the reduce branch April 16, 2024 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants