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

Commit f7516a4

Browse files
kishanrajput23kishanrajput23
committed
parent b90fe0e
author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382430 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dd4ACgkQqt2+DnQi 3HsL9BAAk4JH+GWrBF2vmtMWxG5zCK6Br1NqqFkSj2vta3UGeNnDI5xDE/wdmjMk Dks0rUPtvfoaTH/MCOUTAk9P1pK1C+UJ0LPkISXtXKrRbyB1ShOL+9qwiWtm87mH cj/RhMxkzrgVaMeka/Hfs7iW/cd5keYg3JEzF+ZSfe+UZrtnJ+PACtx/wWJM0MNm ynQVJLpz74HKxchJHFS95UWGb2C0RVCT5+VFTEMXzHKCzqb7KlD2uxa+FiSAHqHs D7tUYhUL7HsE8yekwDWW3/mdXO2OVjJQQ9Qp/z/Uc8iSH+sBMxrzvkXO5nbBY1BX MMUw3E4LgMX0iXacqbJfRSZ7HDi+KXfdOeY03Zln0X4scP27Wgiw0Z6k1WKF5zBE 0z3CiwdAq1fLlEuOt+OX9prfAN11LW6XvUJRuxgD0MC6HW617WXeeNPgRjJB+LXC 5l+FC45HHTFS21ualuszqXUNmWHfJsDI0ZfGqEknsDP1sg4Fe7wEzjG1BUEt0cUA EKi3RiOK/9jvPDqFPWjaOsFJ4xrnmelGlj1l8nNF/xfXuviMJypg5Dhv/HGNCO++ A5OMweMsKHN0HFqBJ+Gap12WZLQawH/y4rjwh4GyRgFHb+54TqMpIs6BMgl7rw7n WomvcBYRbvJgCjEasH94aY9hrGpWqkedByF9vhXg/FRzixyv8lQ= =0pTs -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382427 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0ddsACgkQqt2+DnQi 3HsKSBAA08PfM9v7UM/owSowweAXXgMsxdwc/pQdK9nQs19VtH+fYK4SPwEI2fKM veoncEbaxhFeHOX+FNs3qinl/KDrY4vPfYj+UnzH1onTn04WJYAMNq1xWjR4OGD+ eVymRONr+ZBEodZGYO5ptZFpkAbRhpwwaMVpU1+7CnFZIlCHcr9fRaV3WoZL2xFa Z9Im4Qvq4C46xYDvbqK4J7RPZuKItBC3/UihazThJiSSTRAYqh/DEK9AwRCVbx0Q anQJCOuDzP9Y79r18UHDqLlbEdL+QGko0MG2qtUngDgmHFKft/WESZVY6gDhKeWE 2FY1JBm0nUqaNCAVMus29s+E47t4KIwBJAGYIkpOUteMT8i4Cyj+i/l1bOZcU7nl KXbmciQaE4SjCp3BBvWiC9Wm54A2G+wwnVnLldEt28ADrQArTBJ1vEFJ3CgDzoqV TObRNxb1G1rTKLFuHk0Z9A5VCaHzCTfaJN/A7JKwVeZBFCeVrhfJHkLIenvMNsYH 06oNzaJkYee5SvDr9WtS013MZ9EC4ntme0qfMhPJQSQQj91uWDycJajk0paoqj+H eMx7RKOmaWOk4bzr/6WOjsMhgxmfpHx7h1jxK7EiiYBABJr8aaXWVPWgHKf7TWlH Yt5xnfn1ccdtDOEANAQim5KDjWPOiyqA7a/UFVO4LY7hLdaurY0= =ySQ1 -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382424 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0ddgACgkQqt2+DnQi 3HssXxAAshea+qdu7jttmvbFjJRWGGLgp59Ap4+9hG0VE1PQN2ie8wTSFifObba7 /FVvDzxkRWfQuBo+FfCslbVIUYkHGF5LhYSsPLmq3hgNHKmGQQlRL80NK/ZixCn9 YdPC2nMZi+/kmOwzV7BQWV8CrXKL6/oVFG+nEZ1nxckYIWMVOHNgWWwKO41CpFAs Im5dGz/7Ifz1E/079DCfP5JpY5qzEotMGXAYSLPnUKp88tc/r2AmnoxYMH2v0huu GO4bNWxsdjC2Evkv9QxPfV96t5/WLmTrKN099Gpy6Cz4PtaiuuKosIezAvFelXSf CiIYNGBp+R1w/5L4vodYZjdVcnkoghdJKsRX1f3sjAp+4sTpEzcm9cqp3AjQdk26 qyPeh0psoB6PIo2nhL/ARtc4GljQK3AovDdWXt6goQIwouJvMeMl0vmiCPUl9Df/ EVgsNBHM65Y1BRvQzmve+RE56+zHut4xOOil6il/EkcrdWywHfSg83HAenxQ1C7U Ied7+KB24c3gPKbz3dYwlZ5wIZcn1Q/olhFKCyAVgxMhl2IcRng9dL93yisbUIlZ BVZFCtVPJTTuWL8yuMPYm3qtHgdiqSQDGgpIi4zD/JfnPXikGLdF3lrt2itYrZco +L1sGLAotUi7OMtOnt1ewQE3tRW4YQA2+kUdGvUpnv5bfR3gQVQ= =4MGh -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382416 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0ddEACgkQqt2+DnQi 3HtZpQ/+L1V/pGyOmbqP8tbCXF63iWiaXdX2tGucSZS3TGQF85MDAvRg+udIoiuT LvX5Y/4ZNxZSk1wWhJAVbZy+XKg0oYbwUQnCYs6DjoE7jnfFDnVX6b9IxekBpa8I +7A5T/lNd2YTC+dgGGDBBcjLee/9Wd8YTQzCox/4cd7jN+8S6VrRAwm+5l7JQIMa euRBPi9dGRuQPjyJ7a6W1wGVa2UjI2JQXnWaDDs50qkeUwv6Dc22PpHBQzzxEnKV XvTkhxcxzzOpDx/AxbD/DvB1B5rfPLOgyCAakIiKTcZUbUhSIkWQyagY99ChX8y4 Y+HIHoCJweBfB6NykjjLZy7E94ekgX5K/ne7lnLCn7tL3NqxCJw99i5DxSfXbAtu cuNO+IJeWQHDDX125OP9c4KE101nTQPMOgmiS+Mo3IUa5RaEIsoLFE4BKA9ipMdc 9Db9ifL/vtLbL8THhI+RUcRoLv8ZV/nmvbXXYZ9tCN9nInh8Cg35qln/aL6Po847 XZeA4sDmXagzsNJzsErI2p1x6x3XdOrvZy0KuhhMbGe6/ohKTZVwFf4PHQ/4rn6J ueXyThuWVVW2Y9ME1xN+9A9vAT1MeDv273Xh1Ef0rOSQa7SC9RNSQPiVptaDy87R lw8bX/13naOLZwVW4mAto8zlyAqqEe93/CbD90hk29MdO4y9vjk= =3gGk -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382414 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dc4ACgkQqt2+DnQi 3HvwAxAAsZlocmMpipOONkQYrp4+FeCNEBUYQlXsDnD7R/4OqDUCVX3oH8Yh3xgC oMqbOzrIrMBrIgzy0rnDDU23GhbPF30lVIaPIvv9zNZwC2ffyoHpRnHfh3Ea0+g0 40TCmv11Ze19AR83sGOfkZzbBhpQSiWlzC4OAOyNsFecsF8pGqcGjHhOHeGtqBGj gOOZJjlM2TA2QhSFc22uVw0fzICsRtMR+Rku9yqhgS4HgFfiMvx3THiadTScBFpB Kh9XcHaNjHGEK2WX+lyMiqJSqHXPDLagGqYzHflfYE0+itmetqaSDTQA7tVAmeg4 99RQcIHvKi9qOQkvzzMZDfm042FRDoyFM/cz+d6n8kafyX+QV7YTAOwWRgqwa3b9 sFODs4PPTid3B1TvR3/HpTj9P2XsRDGkH5etOAUsUnEjYY68SFG/6BSFgt65td9w cjsGPxhhoPxWQ84SJ3VoLNsNFhu5X6ULH+rhcBfQ4EodiDISoK6QDyrwTOamuT/z RssGLcjuQOkHZgN52rGakql8a2kLFGshrPmOtiacs4Jn5Gw7UQsAPYhJTSgzeRjG zUgSWmTvWINe423XWA0Cbac+kP71QCqFHdr+4GDnRAc+ZYmz+B5fON5LdERc9Cus ra5PE5uRGyOEnDGBM5jDzLE3fZBK8E+1ysrpCL/4th3TIs/W/Qk= =H9ZS -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382412 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dcwACgkQqt2+DnQi 3Hsnmg/7BygimMmmiiex72Go0MfIIpgvsG/93B89GjhuqEl+v++zfVmRld9hTxUR FSK2u4bM3UYxEhr/KoqjlouWwcKW3ZehNrjPrN3fzUKlpHZs/CKynFf/oPT1uoD2 xZqgMwXkDYD0E8527FvpvZCGJuvwckeBPsdcDk4aof5kjrQtbwWSmeZlpvoh2jyn d9Ym4PYAD8Tsgb4RHeEGd1Jpp6VWkwcrlBx0I18qSR7scE7bVwrWzzrKFYHcD8BJ FimvB4f9WkrR1Cry+U2Up4IOP4tzkSlElofDBQ3E22p/LC6+bPnqKvbNXnf0bQU8 RVgISSKg5dylxxciFxnYVraPVqNbQBu+9W5jqFNHA+EowAg1fba161pmYmF3dRwi EiyGyvc7Z5Dk/JsVjcHx4KujhDR6IPO8hOT3rSMPlC2bN4hUFhyZ/ha4K+tu2E00 wbRjukPDjNnUHtVZqJTHH5a+Z5oy8+vnQe/RR1k9qXTDTMza+2kcC0zH159lIIaj dw4OGXYKI62h+I+8YjfxLiPXRoXEku/Xlg5ShxJw6BSlwyQMlAIehpXG8DMYrmys ddFilp1v2UZZSag12QkrrgnRAegZ94e1COJ62cdInxyWUJAEv62TiBOi7FJNYHId dox1tKht4kfmVPzwoXgu+9PcI5p4pjZoJEjSJxF8yyslMrxIofg= =QpKX -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382410 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dcoACgkQqt2+DnQi 3Hu7UA/+Ki8Sd5c32RZAL+VX7t6lziChh1NVcknjX/rlies3WJaoxahR+bi2ULud ye19Uc3pi8f3GdkGKqqid5hgz1If7UpPYcNdmeQd3Puy/DTISK4+2ubTe0DB3I1+ 1KWXTtFxrZaH3z1RAhv2Mcm4S/2Scz7w70+gxOzFNFFlVcuCPX3e7OXUJFbQyYk/ R+4Yl8ebEJ9GMTJaYOtgFLc7yQTeVO5kdZmB8HpXEaVcpEMofDylNjGusgThL6SL WMLHGY25NSyoMLIiO1B74ouGjWjvyuY0qaXU2uL62HPcho7Em9FpA+GQjwb9XHk2 20ZXtBDdEdDXFyNL32oUDIEx2nF4VuLDES8kdurfaBqVcfExkq6EBbDRE9RPsT/H Bz3OFHpYEVipVAzM3lcdxLOJZlPT5OX0rpYmFLlgjyQBlXI2MapSoOYFHATWR/f1 ocPs+NUg94U8lI+fe1Pl7+lTN6RyP9kh4HMAbKlttI8tSvI52qQnQEWL0Cp7ui8t buPAYI4mPWrToNfydL4xAr881pzPvFiZ/8F9bgYfQHT7rK/hMN//eng6/4hx718e NyxlqeGmQxq+a8haQf2HKzyNTbN4kAa5mCrcq1tBC16bl90m1TVPhPGIgynI5ZoE mzLTcSOgiDMbIVOfmjPbafdJUegLFk9ibkEUhSCFdBWVKu2bIAw= =N9+M -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382406 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dcYACgkQqt2+DnQi 3HsOrA//acnwxmeDOFVZCKYPdGWLBKYqsRU3+LPf/6H9o5TJcY0kKEY+G5Yroc6n QdfL7Gusl60WHD5AuE8yZYYxPIQb4GE076KU+q4UMbe9wxl8J+ycPbQfYfMuG9g3 ZK4anjZD4+cw6wU1Os0ixQsnoD29FzvLVEktuFoQeEWOxIKLhvC0bnv4ErRoNY61 R4E00z5tu446UXuZ7In3g2WgBQIDHxUey47UCgkkp35nCHvsYFJcFNIHWzLy/9dJ OfUjivO7ZIprY3rf5GLX/ji9+Ze/KlGQRJhvZlTWrpp7HNc1K4ceDDb9qo3zLGsx A4UM1so5p1sIk1komwfmJRYnLGRiWZfTI5LZJ3fCwE/DevXiDdzshxUudcPhwZcL 3JfEjtBbpbfuusTc1J/3NY7SUgpL0nJJYb8sOfxTIpOYt+oVEQimblBSoSw288Qw SdHetxm/dgoN0zB7zYo4nXmQW6Wqv9AivgcPP8XUpi7zaUPgrEVDBF0KmhNS1uaA OI9KHqzRnMrJCbgWaoUzB7iP3XGrKd63PqnzqUoHLeq7eh7Czs8m1ch8VHxwhAR5 TDfU6Wbvok7aCaGDVO9ydk1t7Vco/i13E6aXoRL+pYmqPG3aoAIj895ZtHI8Cky4 J0bgTIobOa7mgXL6g8V2ZB1f8ZI9DbiaW3NdNvhzLPrPnTXOlos= =+AiM -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382403 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0dcMACgkQqt2+DnQi 3Ht/GBAAuReQNY6Xn8/xHBCpHK7Os1R9/Qc3L629j8tSfSd7e1RsYai2+sibshQZ w+BbLImcT3mMpSfN8lhFxbUglB5tyhtf4g6GkAnt+ZJVZ4ACkbyRwtEDgaDf/TAe 5r5O+i59UpD7ro4JStOjQ8YGygi6VSYatsJC1HozAb1GTNdbMmwgicjmMa+qyQRm LUVczaY5BQjMXnVKlKzuP4rJsktUndgMeuPMSqHcpLKYhe8E3YoG59Npo8y6BLi/ 88e44+NnyCkSfvbc1P+qQan3Dr2Gsiavx/nA2+fJFowkrW9M/MYUDquLT+fjXFDB +MRR9HNQ9Viei7+a/oPvPqjn/fmfyu5NyZl52qiKfntCxjOdIDV8OeOEffGfU3CE xl754g+UsFgpXjPVG9y6YMyOnMRHMOua4LmcmtglKhn+XvXIRQ2ghnE/76gnBjy8 cFZOS3nfXsHsKngnwoIFYuRJhugbDs+RWjLuSxRo2Wlmm+HnxJNBhd3y+IumGE+j OJz5xP7LN4GrE2PufkIF2O9ZUqjgnh4XArkjphGRgeRdg+tfC8w+dVN2DndZOlJP MrvDsD2AImX3xvOOqnGMrpT+VJMZwTi5UEKX3MtH34WUbSM0JjJ4ihau5nmNvS4c Ry6tK/f49itVRS36VLH+APpzVcrbcS0HDY1d1TU/VlLAeSkocz4= =PAQM -----END PGP SIGNATURE----- parent b90fe0e author Kishan <[email protected]> 1663264066 +0530 committer Kishan Kumar Rai <[email protected]> 1664382399 +0530 gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE/gZ84gKdIZ3MfJvKqt2+DnQi3HsFAmM0db8ACgkQqt2+DnQi 3HuUGhAAzxwpxEcNuOJmE3efqUYZeene74U7gYnHRHRSpJn3R2HUXlTolLBGLC5v ZAOtpmOrKYRuXuyJcxmS1zQqf96CJyYZa0v0FmFGswdiasE6RIHt9tHTGfZWs+F9 9fDdt0+r49Nv3BafxzWf7xJefFQbTAGuJZmsIKUS2seIIGvv0weBovPmg0I3xOXs RCiSuaQf1z7JIpGRBunAkvcMhDCJebbhsNXHcoIPTSvXOX6XYO7FdXAN9yfWxpkJ 5okr434asETrGXsO8ICcj6mszOtlmdPDlxpij4vVH9Ph3Xrystud0gnLXeTak016 LpknA0CZN6asygAWKXND5tgghzmnm9U2/GwXJmUB1O2LefXX2Ne1ocyWGZ3tP6m5 TplVyjU1VpgKTIsHv3Cw3p6dIHw+8Q/LlPOxEoQsH2cKSy3wM/1bHJIyGlVnY0or hYsP4kgOCzO1p7rEkHUUKYb+2nD+ppHfsaO5DCQm7/eIvz/XrdhDzAFc9PISbKvu D2816WAZWK2hUCG5mPLBB7OnA/zcQBlvznvJsCiyALIYIJQOUuCQ4elv7GznQS7b HsrnEJaW6UeF4yXemtv4KU/cxnYw4mGXmlfDq0/UJGyECTBPU18pmWXe/eeOXdjq 2u4QudIcKUMV0xWabbg04rh1UoKDRKN1N+JehzkFpHz6eNz0sl0= =TEyA -----END PGP SIGNATURE----- Signed-off-by: Kishan Kumar Rai <[email protected]> Squash All Commits
1 parent b90fe0e commit f7516a4

22 files changed

+328
-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_1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ We will start off with an easy task.
55

66
Task:
77
Create a [new issue](https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new) on this repository with the following details to be added to the content of the issue:
8+
Create a (new issue)[https://github.com/scaleracademy/scaler-september-open-source-challenge/issues/new] on this repository with the following details to be added to the content of the issue:
89

910
```
1011
name: Add your name here

‎Challenges/challenge_13.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Welcome to Challenge 13
2+
3+
Welcome to the 13th Challenge
4+
5+
Today's challenge involves how to use ``git stash`` command effectively. You can refer on how to stash your commits [here](https://git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning)
6+
7+
Task:
8+
1. Inside the branch you created in the previous challenge ``your-username-details`` create a new file inside the ``contributors/<YOUR-GITHUB_USERNAME>/`` directory.
9+
2. Use the git stash command to move these changes to the stash area
10+
3. Delete the content from the stash area and share a screenshot of this inside the Github issue you created in the first challenge

‎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

0 commit comments

Comments
 (0)