Fixed Typos in EdgeDetect/Module.js #884

[Michaellin250]

Fixes #884

Fix Typo In EdgeDetect Module #884.

Fixed On line 10

• options.hystereis = options.hysteresis || defaults.hysteresis;

• options.hysteresis = options.hysteresis || defaults.hysteresis;

And on line 30

•  pixels = require('./EdgeUtils')(pixels, options.highThresholdRatio, options.lowThresholdRatio, options.hystereis);
  

•  pixels = require('./EdgeUtils')(pixels, options.highThresholdRatio, options.lowThresholdRatio, options.hysteresis);
  

[welcome]

Thanks for opening this pull request!
There may be some errors, but don't worry! We're here to help! 👍🎉😄

[harshkhandeparkar]

Hello @Michaellin250 I think your branch has conflicts. Can you create a fresh one from publiclab/main. Do you know how to do that or do you need the procedure?

[Michaellin250]

How do I fix merge conflicts?

[harshkhandeparkar]

Are you editing files locally(on your pc) or in the browser?

[Michaellin250]

Editing files locally.

[harshkhandeparkar]

Ok since your changes are small you can run the following commands

git remote add upstream https://github.com/publiclab/image-sequencer.git
git fetch upstream
git checkout main
git reset --hard upstream/main
git checkout fixTypo
git reset --hard upstream/main

Doing this will delete all of your changes(edits in files).
Please edit the files again and run the following commands.

git add .
git commit -m "fixed"
git push

Thanks!

[Michaellin250]

Thanks for the instructions. I'm new to git! Did I fix it?

[harshkhandeparkar]

Actually you didn't. What was that last commit?

[harshkhandeparkar]

I think you are running the wrong commands for merging.
You have to run

git fetch upstream
git merge upstream/main

[Michaellin250]

Should I do another pull request then?

[harshkhandeparkar]

Can you please tell me the commands you are running?

[harshkhandeparkar]

No need to open a new pull request.

[harshkhandeparkar]

Are you there?

[Michaellin250]

Yes I'm doing the same commands that was written

[harshkhandeparkar]

Just do the following and nothing else. Tell me if it gives any errors.

git remote add upstream https://github.com/publiclab/image-sequencer.git
git fetch upstream
git checkout main
git reset --hard upstream/main
git checkout fixTypo
git reset --hard upstream/main

Doing this will delete all of your changes(edits in files).
Please edit the files again and run the following commands.

git add .
git commit -m "fixed"
git push

Thanks!

[Michaellin250]

when I try to push

[harshkhandeparkar]

Try

git pull

[harshkhandeparkar]

After running git pull, Try doing what I had told.

[harshkhandeparkar]

Your commit tells that you are merging your own branch fixTypo into the same branch. Can you please tell me the exact commands you have run? Maybe a screenshot of the terminal from the start.

[Michaellin250]

[Michaellin250]

Did I fix it?

[Michaellin250]

I literally did all the commands. I'm pretty sure it's other files that are causing problems.

git remote add upstream https://github.com/publiclab/image-sequencer.git
git fetch upstream
git checkout main
git reset --hard upstream/main
git checkout fixTypo
git reset --hard upstream/main

Then I changed the typos.

Then I did..

git add .
git commit -m "fixed"
git push.

[Michaellin250]

Can I merge now?

[harshkhandeparkar]

Perfect! Thank you for your contribution. Also sorry for the late reply.

[harshkhandeparkar]

@jywarren ready to merge!

[Michaellin250]

Thanks for my first git contribution!! What do I do now?

[harshkhandeparkar]

You can search through the other issues and try to solve one of them!

[harshkhandeparkar]

@jywarren this is a small one. Won't cause any problems. Please try to merge it before it reaches a state where it will require a rebase.

[welcome]

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will be published to https://beta.sequencer.publiclab.org in a day or two.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

[jywarren]

Awesome, folks!!! Thank you!!!

[jywarren]

BTW @Michaellin250 i wanted to say i appreciated your commit message 😂 🎉

commit a516449
Author: MichaelLin250
Date: Thu Mar 28 21:29:41 2019 -0400
TRYING SO HARD TO FIX IT (#950)

Thank you!!!! You did!!! 👍 🎉