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

Branch 1 #137

Open
wants to merge 28 commits into
base: branch-1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
84029d8
SSH Task Done
anshgeez31 Jan 3, 2023
f39467c
SSH keys added
88oo Jan 4, 2023
3180037
true
ABHAY0O7 Jan 5, 2023
ccadde3
Merge branch 'main' into main
anshgeez31 Jan 5, 2023
b0c6f9f
fix for issue#115
MistyRavager Jan 5, 2023
9ddec1c
Merge pull request #111 from anshgeez31/main
ABHAY0O7 Jan 5, 2023
34a553a
Update Info.md
ABHAY0O7 Jan 5, 2023
3b42cda
Merge pull request #116 from MistyRavager/fix
ABHAY0O7 Jan 5, 2023
e6c4410
ssh keys task done
MaheshKarhale2111 Jan 6, 2023
1c22640
SECOND PART TITLE
sushantk1274 Jan 7, 2023
e542671
Merge pull request #117 from MaheshKarhale2111/main
ABHAY0O7 Jan 7, 2023
09b5de6
Revert "ssh keys task done"
ABHAY0O7 Jan 7, 2023
3426ae4
Merge pull request #127 from opencodeiiita/revert-117-main
ABHAY0O7 Jan 8, 2023
6def5c0
ssh keys task done
MaheshKarhale2111 Jan 8, 2023
1ba4949
Title
88oo Jan 7, 2023
084b9b1
Merge branch 'opencodeiiita:branch-2' into branch-2
sushantk1274 Jan 8, 2023
8573332
done merge task
sushantk1274 Jan 8, 2023
6c2b634
my first commit
sushantk1274 Jan 9, 2023
658f60e
Merge branch 'main' into main
88oo Jan 10, 2023
108b9af
Merge pull request #113 from Koshal7/main
ABHAY0O7 Jan 10, 2023
164522d
Merge branch 'main' into mybranch1
88oo Jan 10, 2023
2699fb5
Merge pull request #124 from Koshal7/mybranch1
ABHAY0O7 Jan 10, 2023
b84f2ed
Merge pull request #129 from MaheshKarhale2111/main
ABHAY0O7 Jan 12, 2023
0576c9f
Merge pull request #121 from sushantk1274/task9
ABHAY0O7 Jan 12, 2023
54996fc
Update Info.md
ABHAY0O7 Jan 12, 2023
9f99c5e
Merge branch 'main' into task15
ABHAY0O7 Jan 12, 2023
9825ceb
Merge pull request #133 from sushantk1274/task15
ABHAY0O7 Jan 12, 2023
08ac350
done first pART (#1)
sushantk1274 Jan 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ CONTRIBUTORS/IITH/2nd/Kushagra/Info.md
CONTRIBUTORS/IIITA/Second\ Year/bhumika-kalaru/info.md
CONTRIBUTORS/IIITA/Second Year/Koshal/info.md
CONTRIBUTORS/IIITA/Second\ Year/Ananya/info.md
CONTRIBUTORS/IIITA/Second Year/Ansh/info.md
CONTRIBUTORS/IIITA/First Year/C Karthik Reddy/info.md
CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md

14 changes: 14 additions & 0 deletions CONTRIBUTORS/IIITA/Second Year/Ansh/info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
My Name is Ansh Kothari. I am in second year at IIITA.
My enrollment number is IEC2021006.

Private Repo Link: https://github.com/anshgeez31/Private_Repo_OpenCode

Problem facing: While mkdir we are creating a new folder but when we try to git add . it then there is a message appears which says that working tree is clean that means that no changes were detected when you create a directory.
Reason: In Git, directories exist only implicitly, through their contents. Empty directories have no contents, therefore they don't exist. Or to put it another way: Git is a content tracker. .gitkeep is a dummy file that makes sure that git recognises the empty folder so we can include this in an empty folder for git to easily detect it.
This is edited by Ansh Kothari. Roll No. IEC2021006

Q) What do you really understand from SSH keys in VCS? What are the advantages of using it?

Ans).
SSH creates a routes and all the encrypted data are transferred through it with no security issues. we can securely transmit data files. It is more secured than login id and password which could be hacked.
It is a kind of networking protocol, that digs a secure tunnel between the host and the server. It's a two way channel(Secured Shell) that is meant by the exchange of data, in the form of cryptogenically key(4096 bits) used to encrypt it(by using public key:- Which is accessible to everyone) and decrypt(only by the private key:- which is accessible to only host and the server) so that the info. between them got secured, and pass through secured channel and make it free from hacking or data leakage between them by any malicious effect.
15 changes: 15 additions & 0 deletions CONTRIBUTORS/IIITA/Second Year/Koshal7/info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

Ques - How to edit the last commit message in git?
Ans - first make a commit message, make a PR then with the help git command
"git commit -m " " --amend " we can overwrite the previous commit message
after this when we force push the commit otherwise it will throw an error
as there was no modification in the repo. This we can edit the last commit message.

Ques - What do you really understand from SSH keys in VCS? What are the advantages of using it?

Ans - SSH keys replaces username and password while connecting local repo to Github. we can write and access data in repos on github using secure shell protocol (ssh).

Advantages:

SSH makes it faster and secure to transfer files over untrusted network.
we dont have to login using username and password while pushing commits on remote repos.
42 changes: 42 additions & 0 deletions CONTRIBUTORS/IIITA/Second Year/sushant_kumar/info.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

It is a 3 way merge as defintion is down...


The reason it is called a 3-way merge is because the Merge Commit is based on 3 different commits.

The common ancestor of our branches, in this case sir you have added a commit. This commit contains code before we diverge into different branches.

The tip of the Master branch, that is the last commit performed on the Master branch that i have done while mergig my branch-2 to branch-1

The tip of the Feature branch, the last commit performed on the Feature branch that i will do while while merging my branch-1 to your branch-1

To merge the changes from both the branches, Git looks at the three different snapshots - the before snapshot and the after snapshots. Based on these snapshots, Git combines the changes by creating the new commit called the Merge Commit..
=======

we know that the fork and PR model is a version of git's own branch-and-merge functionality, in which commits can follow separate paths (called branches) and then be brought back together.

this is called branch and merge

step 1 first we will git checkout branch-2

then we will commit and push our changes

step 2. merge it to branch-1 and make a PR for original repo

# Different delete task

i will give description in first commit and delete my most recent commit that is my second commit using the command

git reset --hard HEAD^

We should have to follow this as if the commmit is not pushed online yet the we have to follow only two of the strps but if the message is committed online then we have also to force push the value


On the command line, navigate to the repository that contains the commit you want to amend.

step1)Type "git commit --amend" and press Enter...

step2)Use the push --force-with-lease command to force push over the old commit.

step3)this is the command actually "$ git push --force-with-lease origin EXAMPLE-BRANCH"

5 changes: 0 additions & 5 deletions CONTRIBUTORS/IITH/2nd/kushagra/Info.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
Hi, i am Kushagra, sophomore at IITH, and i like to learn new things

**Ques** - What do you really understand from SSH keys in VCS? What are the advantages of using it?

**Ans** :
- So SSH (Secure Shell) key helps us in not requiring us to validate our email/username/password again and again when we try to contribute on github by pushing, etc..
- Also its tough for someone to crack SSH keys as they are encoded using RSA encryption, and one needs both public and private keys to gain access. Public key is uploaded on github, while private key is stored in our desktops and is then we can securely connect to github, they can verify our connection and hence we dont need to repeatedly give username, password and we can work non-abruptly
5 changes: 5 additions & 0 deletions CONTRIBUTORS/IITM/3rd/Mahesh Karhale/info.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Hello I am Mahesh, third year from IIT Madras. I am very enthuastic about web development as well as competitive programming. I am learning javascript and nodejs. I am lil inclined towards design too!

Private repo link - https://github.com/MaheshKarhale2111/Repo_for_opencode-

What do you really understand from SSH keys in VCS? What are the advantages of using it?

GitHub ssh keys are nothing but another way of authentication, slightly different from traditional mode of authentication that is username and password. Using ssh keys gives you advantage of push and fetch data without having to authorize your github credentials everytime you push or fetch plus it comes with additional security.
Ssh keys are generated in pair- public and private, while public key is given to github and private key remains in system. Whenever authentication operation is required , the private key and public key in github try to communicate and set up authentication, kind of handshake. If matched then opertion proceed further.