Skip to content

Commit

Permalink
Merge pull request kunal-kushwaha#580 from SurajPratap10/main
Browse files Browse the repository at this point in the history
📝 Update CONTRIBUTION.md
  • Loading branch information
kunal-kushwaha authored Feb 1, 2022
2 parents b2b923d + fb35863 commit e06f20d
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion ASSIGNMENT_SOLUTIONS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 💡SOLUTIONS

## Public repositories that contain solutions for [assignments](https://github.com/kunal-kushwaha/DSA-Bootcamp-Java/tree/main/assignments)
## Public repositories that contain solutions for [assignments] --> (https://github.com/kunal-kushwaha/DSA-Bootcamp-Java/tree/main/assignments)

### Java

Expand Down
23 changes: 11 additions & 12 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community includes:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Demonstrating empathy and kindness toward other people.
* Being respectful of differing opinions, viewpoints, and experiences.
* Giving and gracefully accepting constructive feedback.
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
and learning from the experience.
* Focusing on what is best not just for us as individuals, but for the
overall community
overall community.

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
advances of any kind.
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Public or private harassment.
* Publishing other's private information, such as a physical or email
address, without their explicit permission
address, without their explicit permission.
* Other conduct which could reasonably be considered inappropriate in a
professional setting
professional setting.

## Enforcement Responsibilities

Expand Down Expand Up @@ -123,6 +123,5 @@ enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
For answers to common questions about this code of conduct, see the FAQ at:(https://www.contributor-covenant.org/faq).
Translations are available at:(https://www.contributor-covenant.org/translations).
18 changes: 13 additions & 5 deletions CONTRIBUTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,27 @@


```git clone https://github.com/your_user_name/DSA-Bootcamp-Java.git```

3. Check that your fork is the "origin" remote.


```git remote add origin URL_OF_FORK```

4. Add the project repository as the "upstream" remote.

```git remote add upstream URL_OF_FORK```

3. Create a new Branch:
5. Create a new Branch:


```git branch -YourBranchName-```


```git checkout -YourBranchName-```

4. Make your contributions.
6. Make your contributions.

5. Stage your changes and make a commit.
7. Stage your changes and make a commit.


```git add .```
Expand All @@ -27,9 +35,9 @@
```git commit -m "<your_commit_message>"```


6. Push your local commits to the remote Repository.
8. Push your local commits to the remote Repository.


```git push origin -YourBranchName-```

7. Create a PR.
9. Create a PR.
1 change: 1 addition & 0 deletions NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- [Divija Kinger](https://github.com/divijakinger/DSA_Java)
- [Vrukshali Torawane](https://github.com/Vrukshali-26/DSA)
- [Anuja Kumari](https://github.com/Anujakumari/DSA)

- DSA-Java
- [GitHub-Repo](https://github.com/Utkarsh1504/DSA-Java) - for contribution
- [Notes-website](https://utkarsh1504.github.io/DSA-Java/) - for revision
Expand Down
4 changes: 2 additions & 2 deletions assignments/02-first-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## Write Java programs for the following:

1. Write a program to print whether a number is even or odd, also take
input.
2. Take name as input and print a greeting message for that name.
input from the user.
2. Take name as input and print a greeting message for that particular name.
3. Write a program to input principal, time, and rate (P, T, R) from the user and
find Simple Interest.
4. Take in two numbers and an operator (+, -, *, /) and calculate the value.
Expand Down

0 comments on commit e06f20d

Please sign in to comment.