-
-
Notifications
You must be signed in to change notification settings - Fork 74
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
refactor: renamed public
to pub
and removed some un-used functions
#26
refactor: renamed public
to pub
and removed some un-used functions
#26
Conversation
@tdejager Can you squash both commits into one and rebase onto master? After that I can incorporate them. |
public
to pub
and removed some un-used functionspublic
to pub
and removed some un-used functions
@tdejager could you take another look at this? |
Brought this brach up-to-date with master again |
Codecov Report
@@ Coverage Diff @@
## master #26 +/- ##
=========================================
+ Coverage 71.52% 71.7% +0.17%
=========================================
Files 106 106
Lines 7204 7213 +9
=========================================
+ Hits 5153 5172 +19
+ Misses 2051 2041 -10
Continue to review full report at Codecov.
|
@tdejager Could you squash and rebase this PR so we can "rebase and merge" it into master? It's currently still showing conflicts. Running:
will show you what exactly. |
Sorry, but I've used a regular merge. Even when squashing my commits, although I don't think it matters (you have to solve for commits on the remote branch I believe), I have to solve a merge conflict for an unknown number of commits. Because the generated files are almost always changed. I stopped rebasing after about fixing 4 commits... |
No description provided.