Skip to content
This repository has been archived by the owner on Apr 5, 2024. It is now read-only.

Added JPEG route #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Conversation

idoodler
Copy link

I needed the ability to fetch a single JPEG.

@idoodler
Copy link
Author

idoodler commented Dec 6, 2019

I am unable to see the details, why the versionist task failed. Any information on this?

@mbalamat
Copy link
Contributor

Hey @idoodler sorry I didn't see this earlier. You need to change your commit message, check my response to this one #54 (comment)
The commit linter is this one: https://github.com/balena-io/resin-commit-lint

@mbalamat
Copy link
Contributor

so the commit message might be

server: Add JPEG route

Change-type: minor
Signed-off-by: Your Name <your email>

Change-type: minor
Signed-off-by: Your Name <your email>
@mbalamat
Copy link
Contributor

@idoodler can you remove the merge commit so your PR has the commit of the change and rebase to master?

@idoodler
Copy link
Author

idoodler commented Jan 3, 2020

@mbalamat I am sorry, I have no idea what the issue is. Why do I need to do this you elaborated above?

@mbalamat
Copy link
Contributor

@idoodler because as a method of getting even with the master branch we use rebase instead of merge. It keeps the the commit history cleaner because you have one commit instead of two, in this case. In order to do this, you can do git reset --hard HEAD~1 to remove the Merge branch 'master' into master commit, then checkout to master, then pull the latest master, then checkout to your working branch and do a git rebase master. Please tell me if you would like me to do it for you. Also FYI we can't currently test and merge this and the other pending PRs, because we need balenaOS version 2.4x to be available in production for the piZero (2.3x has an issue regarding the camera libraries), which I think will be out this week or the next one.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants