-
Notifications
You must be signed in to change notification settings - Fork 34
Adding catalog numbers to a series #1392
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
Adding catalog numbers to a series #1392
Conversation
Generated by 🚫 Danger |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few minor comments.
95886c0
to
f323ddc
Compare
@@ -32,7 +32,7 @@ | |||
public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru"; | |||
|
|||
// MUST be updated when any of our resources were modified | |||
public static final String RESOURCES_VERSION = "v0.4.3.2"; | |||
public static final String RESOURCES_VERSION = "v0.4.3.4"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This means that you have to rebase your branch on top of master.
- sync master with php-coder/master
$ git checkout master
$ git fetch upstream
$ git merge upstream/master
$ git push
- do rebase
$ git rebase master adding-catalog-numbers-to-a-series
$ git push -f
If you encounter any errors, post them here.
357291e
to
cbcd61d
Compare
public static final String RESOURCES_VERSION = "v0.4.3.3"; | ||
======= | ||
public static final String RESOURCES_VERSION = "v0.4.3.4"; | ||
>>>>>>> task: implement AddCatalogNumbersForm |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, you forgot to remove fragments after a conflict. Please, edit this file and just change v0.4.3.3 to v0.4.3.4
public static final String RESOURCES_VERSION = "v0.4.3.3"; | ||
======= | ||
public static final String RESOURCES_VERSION = "v0.4.3.4"; | ||
>>>>>>> task: implement AddCatalogNumbersForm | ||
|
||
// CheckStyle: ignore LineLength for next 14 lines |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As you and another line, this comment should be updated to ignore 15 lines.
cbcd61d
to
487ef61
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't look on it deeply yet but the tests have been passed, I don't see anything that should be fixed. The markup will be modified anyway later. So, it's LGTM!
Thank you!
@bahoss Great work! Thank you for your patience! I've added your contribution to https://github.com/php-coder/mystamps/wiki/team-members and I can congratulate you with 5 merged PRs! |
Fixes #1341