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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue #12 - added LICENSE.md file #24

Merged

Conversation

Projects
None yet
3 participants
@deepanjali19
Copy link
Contributor

commented Nov 13, 2018

Hey I have added the licence file. Please let me know if it needs any changes. 馃憤

@SeanPrashad SeanPrashad self-requested a review Nov 13, 2018

@SeanPrashad
Copy link
Contributor

left a comment

First off, thanks so much for helping us get a license incorporated into Creative Collab! It is definitely an important item as we continue to build our app 馃憤馃徑

I have left one tiny suggestions for us to improve this!

@@ -0,0 +1,7 @@
Copyright <2018> <Mera Gangapersaud>

This comment has been minimized.

Copy link
@SeanPrashad

SeanPrashad Nov 13, 2018

Contributor

Check out how this renders:

https://github.com/Mera-Gangapersaud/Creative-Collab/blob/651c55f23e0e3cbde7c334ff34afffd486e8b16b/src/LICENCE.md

You'll notice that Mera's name is missing! 馃檧

We'll need to update this to Copyright 2018 Mera Gangapersaud

This comment has been minimized.

Copy link
@deepanjali19

deepanjali19 Nov 13, 2018

Author Contributor

I will work on that 馃憤馃徎馃槉

@SeanPrashad

This comment has been minimized.

Copy link
Contributor

commented Nov 13, 2018

In addition, we'll need to update the name of the file from LICENCE.md to LICENSE.md - thank you!

@deepanjali19

This comment has been minimized.

Copy link
Contributor Author

commented Nov 13, 2018

Ahh lame typo! Sorry about that and I鈥檒l get it fixed asap 馃槉

@SeanPrashad
Copy link
Contributor

left a comment

This is looking perfect 馃ぉ

Updated LICENSE.md file:

screen shot 2018-11-13 at 10 22 06 am

Let's get one more review just to be sure!

@SeanPrashad SeanPrashad requested a review from Mera-Gangapersaud Nov 13, 2018

@deepanjali19

This comment has been minimized.

Copy link
Contributor Author

commented Nov 13, 2018

@SeanPrashad that was lightning fast! Thank you 馃槂

@SeanPrashad SeanPrashad changed the title Fix for issue #12 - added LICENCE.md file Fix for issue #12 - added LICENSE.md file Nov 14, 2018

@Mera-Gangapersaud
Copy link
Owner

left a comment

Thanks so much for adding this @deepanjali19 The License looks great! Before we merge could you please remove the Licence.md file from the PR?

@SeanPrashad

This comment has been minimized.

Copy link
Contributor

commented Nov 14, 2018

You'll also need to perform a rebase - @humphd had walked us through it in class! But if you forget, it's no biggie 鉁岎煆

We'll need to do a few things:

  1. Remove the src/LICENCE.md file and leave only src/LICENSE.md remaining:

    git rm src/LICENCE.md && git commit --amend --no-edit

  2. Move the LICENSE.md from src into the root directory:

    git mv src/LICENSE.md . && git commit --amend --no-edit

  3. Perform a git rebase to pull in the latest changes from master and add your own commits afterwards:

    git checkout master && git pull && git checkout - && git rebase master && git push -f

  4. You're done! We'll be notified that you've updated your PR with the above three steps. Let us know if anything is unclear

@deepanjali19 deepanjali19 force-pushed the deepanjali19:deepanjali19/licence branch from 9ec6af3 to 11c7e90 Nov 14, 2018

@deepanjali19

This comment has been minimized.

Copy link
Contributor Author

commented Nov 14, 2018

Again a problem! I need @humphd for this rescue.

@SeanPrashad

This comment has been minimized.

Copy link
Contributor

commented Nov 14, 2018

Please let us know how we can also help. Any error messages and/or screenshots would be great!

@deepanjali19 deepanjali19 force-pushed the deepanjali19:deepanjali19/licence branch from 11c7e90 to c8073b5 Nov 14, 2018

@deepanjali19

This comment has been minimized.

Copy link
Contributor Author

commented Nov 14, 2018

Hey, I worked with @humphd and these test fails do not seem to make sense. I would appreciate some advise on how to fix this.

@Mera-Gangapersaud

This comment has been minimized.

Copy link
Owner

commented Nov 14, 2018

Hey @deepanjali19 , I've looked into the TravisCI error and seems to be something wrong with our travis.yml config (master branch biuld is failing too). So the error is on our end. That aside you rebased it and removed the LICSENCE.md file so I'll go ahead and merge this despite the the build err. Sorry about the confusion.

@Mera-Gangapersaud Mera-Gangapersaud merged commit 7489226 into Mera-Gangapersaud:master Nov 14, 2018

1 check failed

Travis CI - Pull Request Build Failed
Details

@SeanPrashad SeanPrashad referenced this pull request Nov 14, 2018

Closed

Add LICENSE.md #12

@deepanjali19

This comment has been minimized.

Copy link
Contributor Author

commented Nov 15, 2018

Thank you so much @Mera-Gangapersaud and @SeanPrashad for helping me out!

Pooch11 added a commit to Pooch11/Creative-Collab that referenced this pull request Nov 15, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.