Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit c4e168c

Browse files
committed
Merge branch 'main' into sreejasaha19-details
2 parents c18499e + 079c60f commit c4e168c

12 files changed

+183
-0
lines changed

.github/workflows/linter.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Lint Code Base
2+
3+
on:
4+
push:
5+
branches-ignore: [master, main]
6+
# Remove the line above to run when pushing to master
7+
pull_request:
8+
branches: [master, main]
9+
10+
jobs:
11+
build:
12+
# Name the Job
13+
name: Lint Code Base
14+
# Set the agent to run on
15+
runs-on: ubuntu-latest
16+
17+
##################
18+
# Load all steps #
19+
##################
20+
steps:
21+
##########################
22+
# Checkout the code base #
23+
##########################
24+
- name: Checkout Code
25+
uses: actions/checkout@v3
26+
with:
27+
# Full git history is needed to get a proper list of changed files within `super-linter`
28+
fetch-depth: 0
29+
30+
################################
31+
# Run Linter against code base #
32+
################################
33+
- name: Lint Code Base
34+
uses: github/super-linter@v4
35+
env:
36+
VALIDATE_ALL_CODEBASE: false
37+
DEFAULT_BRANCH: main
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Challenges/challenge_14.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Welcome to Challenge 14
2+
3+
Welcome to the 14th Challenge
4+
5+
Today is the first part of the two challenges related to resolving merge conflicts. You can take a look at [this article](https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts) to learn more about merge conflicts.
6+
7+
As part of the challenge, try to create a scenario of a merge conflict locally in your system for a project that you can create.
8+
9+
Task:
10+
1. Follow the article shared above and try to reproduce a case of merge conflict in your system for a project and try to resolve it
11+
2. Share appropriate screenshot in the issue created in the first challenge.

Challenges/challenge_15.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Welcome to Challenge 15
2+
3+
Welcome to the 15th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the first part of this challenge:
8+
9+
Task:
10+
1. Update your Forked Repo From the Original Repo. Also ensure that your branch ``your-user-name-details`` is also synced with the latest changes from the original repository
11+
12+
2. In your branch ``your-user-name-details`` open the add your name to the list of challengers inside the ``challengers-list.md`` file by following the format in the file.
13+
14+
3. Push your change to reflect in the Pull Request created in previous challenges
15+

Challenges/challenge_16.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Welcome to Challenge 16
2+
3+
Welcome to the 16th Challenge
4+
5+
In this 2 part challenge, we will try to emulate and fix merge conflicts via git.
6+
7+
Today is the second and final part of this challenge:
8+
9+
Task:
10+
1. You will notice that your pull request will have a conflict: <img width="636" alt="image" src="https://user-images.githubusercontent.com/19529592/190574995-0cc506a8-a2fe-4aa4-98bd-4658e8aa2fc1.png">
11+
12+
2. Try to resolve this merge conflict using local git
13+
14+
3. Once resolved, share screenshot on the github issue created in the previous challenges

Challenges/challenge_17.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Welcome to Challenge 17
2+
3+
Welcome to the 17th Challenge
4+
5+
Today we will be leaning how to work with GitHub Desktop
6+
7+
#### Brief Overview
8+
9+
GitHub Desktop is a GUI that empowers *lazy* users who prefer not to work with the CLI to still interface with Git and GitHub.
10+
To learn more visit: [What the heck is Git GUI](https://help.github.com/en/desktop/getting-started-with-github-desktop)
11+
12+
13+
## Tasks
14+
15+
- Download GitHub desktop
16+
- Create a new repository on GitHub
17+
- Add anything you want to your repo
18+
- Follow through all the GitHub workflow you know using the GUI (commit, branching, pulling, pushing etc)
19+
- Share a screenshot of your experience using github desktop on the issue created in prior challenges

Challenges/challenge_18.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## Welcome to Challenge 18
2+
3+
Welcome to the 18th Challenge
4+
5+
Today we will be learning to work with GitHub Gist and Markdown
6+
7+
#### Brief Overview
8+
9+
GitHub Gist is two fold and you can either use it for sharing ideas or sharing smaple code. It supports **Markdown**
10+
To learn more, vist:
11+
- [Learn more about GitHub gist](https://help.github.com/en/enterprise/2.13/user/articles/about-gists)
12+
13+
## Task
14+
15+
- Create a gist writing on any software development related topic that interests you
16+
- Create a gist sharing a small code snippet in your preferred programming language
17+
18+
## How to Submit
19+
20+
- Create your submission a markdown file named ``gist-solutions.md`` and add it inside the branch ``your-username-details`` used in previous challenges
21+
- In your submission file add the links to your **2 gist**
22+
- Ensure you push it so that it reflects inside your Pull request created in previous challenges

Challenges/challenge_19.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## Welcome to Challenge 19
2+
3+
Welcome to the 19th Challenge
4+
5+
Today's challenge is unique. Today we will learn about code linting. A linter is defined as follows:
6+
- Lint, or a linter, is a static code analysis tool used to flag programming errors, bugs, stylistic errors and suspicious constructs.
7+
8+
So in order to ensure proper codestyling and structure, there are checks run on pull requests to ensure the code is properly linted. We have also placed a code linter Github action which will keep a track whether your code is properly linted or not.
9+
10+
Task:
11+
1. Create a new file inside your branch created in previous challenges ``your-username-details`` under the directory ``contributors/username``. The file needs to be a source code file written in your preferred programming language. The code can be anything you want: hello world program or your favorite program.
12+
2. Commit the change and push it.
13+
3. Check if your linting fails in side the Pull request: <img width="870" alt="image" src="https://user-images.githubusercontent.com/19529592/190969615-f3205b26-83eb-4b5f-b7a5-19567a575a9a.png"> <br> Then lint your code to ensure that this check passes inside your pull request.

Challenges/challenge_20.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## Welcome to Challenge 20
2+
3+
Welcome to the 20th Challenge
4+
5+
Today you will learn about project boards on GitHub
6+
7+
### What are Github Project Boards?
8+
9+
GitHub project boards helps you keep track of stuffs you're actively working on within your repository. You can say it's a project managemnet tool, or even a collaboration tool for teams. You create a project board with columns for your TODO or backlogs or even bugs, In progress activies and lastly a column for your finished tasks. You can sort of see it as a SCRUM board. To learn more [about project boards go through this link](https://help.github.com/en/github/managing-your-work-on-github/about-project-boards)
10+
11+
## Tasks
12+
13+
- Create a GitHub repository for any project you can think up
14+
- On a sheet of paper create a TODO list (or backlog) of features you want to have in you app
15+
- Create a project board with a `TODO` column, `In progress`, `Done`
16+
- Create a card for all the items you already wrote on the sheet of paper in the TODO column
17+
- Work on the features synchronously and move the card respectively for each in progress task to the `In progress` column
18+
- When you're done with the `In progress` task move the card to the `Done` column
19+
20+
## How to submit your entry
21+
22+
- Take a screenshot of your project board for when you moved an card from `In progress` to `Done`
23+
- Add you screenshot to the Github issue created in the previous challenges

Challenges/challenge_21.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## Welcome to Challenge 21
2+
3+
Welcome to the 21st Challenge
4+
5+
Today we will be learning about Git Aliases! :). This is an amazing feature that helps us use less keystroke
6+
7+
The term alias is synonymous with a shortcut. Alias creation is a common pattern found in other popular utilities like `bash` shell. Aliases are used to create shorter commands that map to longer commands. Aliases enable more efficient workflows by requiring fewer keystrokes to execute a command. To learn more;
8+
9+
- [Git Alias](https://www.atlassian.com/git/tutorials/git-alias)
10+
11+
## Tasks
12+
13+
- Go through the Git Alias documentation shared here
14+
- Create at least 2 alias for any git commands you feel is too long
15+
- Take a screenshot of the alias you created. hint run `git config --get-regexp alias`
16+
- Take a screenshot of using your alias
17+
- Post these screenshot in the issue created in the prior challenges

contributors/sreejasaha19.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
name: Sreeja Saha
3+
github_user_name: sreejasaha19
4+
url_of_github_issue: https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/126#issue-1358568239
5+
your_favroite_programming_language: Python
6+
---
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
Link of software development related topic gist: https://gist.github.com/sreejasaha19/4c9c957498177bc8f48ceea79c068378
3+
Link of code snippet in Python gist: https://gist.github.com/sreejasaha19/6942bf46f17cffc4cd4f9ed5152f2d69
4+
---

contributors/sreejasaha19/temp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)