Merge branch 'task4' into PR-branch

GeekHaven · Jan 18, 2022 · 02fd6f9 · 02fd6f9
2 parents 838d8c3 + 2f40e92
commit 02fd6f9
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 29 deletions.
diff --git a/AadiYNWA/abhay.txt b/AadiYNWA/abhay.txt
@@ -0,0 +1,2 @@
+Alexa must use pull command.
+git pull origin <branch_name>
diff --git a/AadiYNWA/info.txt b/AadiYNWA/info.txt
@@ -0,0 +1,5 @@
+I am clear with all concepts taught in FOSS.
+
+Git is a VCS and keeps track of files and saves info such as what, when and who made changed to a file.
+Github is a online server to store remote repositories. It allows us to collborate with thousands of devolopers around the world and
+contribute to their work. It is useful for collaboration anf when multiple people are working on same project.
diff --git a/BuddyLongLegs/info.txt b/BuddyLongLegs/info.txt
@@ -0,0 +1,2 @@
+Rebase
+GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere.
diff --git a/PiyushGG18/abahy.txt b/PiyushGG18/abahy.txt
@@ -0,0 +1 @@
+git pull
diff --git a/PiyushGG18/info.txt b/PiyushGG18/info.txt
@@ -0,0 +1,3 @@
+well I understood everything not at an advanced level but all that was in ppt was readable as well as understandable now
+Git is useful to make projects available to other people who each other by working together on same project whitout having dependency 
+on other's work while github is one of the platform which offers this services
diff --git a/README.md b/README.md
@@ -1,38 +1,32 @@
 # GoGit
 ## Task 4
 ### Step-1
-- First checkout to the task4 branch and create a new branch named `PR-branch`.
-- Now in your task4 branch create a new folder whose name will be your GitHub username.
-- Inside this folder create a text file whose name will be `info.txt`.
-- Now inside `info.txt` answer this question.</br>
- **Ques- Name the topics that you did't understand from FOSS workshops.**
-- Now add your changes and then commit them with this commit message - `Commit-1`.
-
-### Step-2
-- Now, from your `task4` branch, create a new branch named `abhay`.
-- In `abhay` branch, create a new text file whose name will be `abhay.txt`.
-- Now inside `abhay.txt`, answer this question.</br>
- **Ques- Tom and Alexa are working on the same project say Hulk. Tom made some changes in the Hulk project and pushed the changes from his local git repository. Alexa wants to see the changes in her local git repo as well. Which of the following command she should use to get the latest version of the project?**
-- Now add your changes and then commit them with this commit message - `Commit-2`.
+In your forked Repository you have to Create a ```<github-username>.html``` file like ```shashwat-mittal.html``` and paste the following content in the file (replacing with your details).
+```Java
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    <p style="font-size:50px">Your Name</p>
+    <p style="font-size:30px">Your Roll No</p>
+    <p style="font-size:30px">Your Discord Id</p>
+</body>
+</html>
+  ```
+ ### Step-2
+<b>Now, you have to host it on Github and keep the link of the hosted website for Step-3.</b>
 
 ### Step-3
-- Come back to your `task4` branch and inside `info.txt` file that you created earlier in step-1, answer this question. **Ques- Explain in brief the uses of git/github.**
-- Now add your changes and then commit them with this commit message - `Commit-3`.
-
-### Step-4
-- This step is a recalling step i.e. you will see that what changes you did in task4 and in which branch.
-- Checkout to branch `task4` and use `git log` to see commit history. (Note that which commit is present in this branch)
-- Checkout to branch `abhay` and use `git log`. (Note that which commit is present in this branch)
-- Now checkout to `PR-branch` branch, the branch that you created in the very first step and use `git log`, in git log output you will find that there is no any commit present     that you did while doing this task.
-
-### Final Step
-- In this step you have to bring all the changes that you did in this task (all 3 commits) into this `PR-branch`, and just only bringing is not enough, the method of bringing should be such that there should be no any extra commits other than the 3 commits that you did in this task i.e. only `Commit-1`, `Comit-2` and `Commit-3` should be present and also the final order of the commits in this branch after the valid procedure that you used to bring the changes of other branches into `PR-branch` should be only this.
-
-![image](https://user-images.githubusercontent.com/75938293/149640060-34879c00-1117-47b1-bcc6-44f4e80efb46.png)
-- Now finally `push all your branches` and on github create a Pull Request from your `PR-branch` to my `task4` branch. Be sure to mention the `Issue No.` in the PR.
-
-### Note- ☠️ Don't just copy paste your changes and commit them as I want, use a valid git procedure to do this task. If found that you didn't use any valid git procedure, that may lead to a ban from any further contests. 
+Create a Pull Request and while creating it <b>mention the link of the Github Page in the description of the Pull Request.</b>
+![image](https://user-images.githubusercontent.com/74846797/149649303-5670735d-0802-4d76-954d-58dbcdf72483.png)
 
 
+<hr>
 
+Checkout to branch `task2` for the next task
 
diff --git a/Shubhankit-Pandey/info.txt.txt b/Shubhankit-Pandey/info.txt.txt
@@ -0,0 +1,3 @@
+Reset commands (help,mixed,soft)
+Since it is DVCS many people can work on a large project according to their will and choice without caring about
+what changes other person has made. Even if one user corrupts a file he can always switch back to original one.
diff --git a/TheRealSibasishBehera/abhay.txt b/TheRealSibasishBehera/abhay.txt
@@ -0,0 +1 @@
+git pull
diff --git a/TheRealSibasishBehera/info.txt b/TheRealSibasishBehera/info.txt
@@ -0,0 +1,6 @@
+i would like to know more about push flags and reset flags
+git is a excellent platform to record changes in your local file
+using git we can pull some code as well as push ours
+this helps in collabarating with other other organisation and developers
+github is a platform to host your work and to request for merging you changes in original remote repo
+
diff --git a/abhay.txt b/abhay.txt
@@ -1 +1,23 @@
+BuddyLongLegs:
+She must use the git fetch command
+
+Atharva-gadekar
+git fetch
+
+maheshwariparth:
+git pull
+
+vipuljain100:
+git fetch 
+
+yashg-116:
+pull command
+
+tsunami03:
+git fetch
+
+rashi-2003:
+git fetch
+
+bhumika-kalaru
 git pull
diff --git a/abhay.txt.txt b/abhay.txt.txt
@@ -0,0 +1 @@
+git pull origin Hulk (fetch and pull principle).
diff --git a/akshatsgh/abhay.txt b/akshatsgh/abhay.txt
@@ -0,0 +1 @@
+git fetch
diff --git a/akshatsgh/info.txt b/akshatsgh/info.txt
@@ -0,0 +1,2 @@
+Everything understood
+It makes easy for many people to work on same project with much ease due to its various available functions.
diff --git a/atharva-gadekar/info.txt b/atharva-gadekar/info.txt
@@ -0,0 +1,2 @@
+Rebasing, Stashing
+Git and Github help us to contribute to open source projects. They give us an efficent way to share our code globally.
diff --git a/dakshita-tripathi/abhay.txt b/dakshita-tripathi/abhay.txt
@@ -0,0 +1 @@
+ git pull 
diff --git a/dakshita-tripathi/info.txt b/dakshita-tripathi/info.txt
@@ -0,0 +1,2 @@
+Hosting a website 
+Git/github can be used to publish your work such as code for a website or app. This published code can be accessed by everyone and hence we can see the changes they have to offer for our code 
diff --git a/maheshwariparth/info.txt b/maheshwariparth/info.txt
@@ -0,0 +1,4 @@
+deleting a commit
+Uses of git/github:
+Multiple developers can work on same project.
+You can track the changes made on project.
diff --git a/rashi-2003/info.txt b/rashi-2003/info.txt
@@ -0,0 +1,2 @@
+merge
+GitHub hosts your source code projects in a variety of different programming languages and keeps track of the various changes made to every iteration. So, the “Git” implies the version control system; a tool which allows developers to keep track of the constant revisions to their code.
diff --git a/tsunami03/info.txt b/tsunami03/info.txt
@@ -0,0 +1,3 @@
+I did not fully understand the difference between merge and rebase
+Git and Github is utilised to facilitate an organised workflow for open source projects since 
+a lot of people work on the same code, it becomes necessary to have proper logs for all the changes.
diff --git a/vipuljain100/info.txt b/vipuljain100/info.txt
@@ -0,0 +1,3 @@
+Rebasing and Stash
+Developers and Programmers can collaborate to work on code. The primary benefit is its Version Control System which 
+allows for seamless collaboration without compromising the integrity of the original project.
diff --git a/yashg-116/info.txt b/yashg-116/info.txt
@@ -0,0 +1,3 @@
+Pull and fetch- slight confusion
+rest all fine
+Git/GitHub is a website for developers and programmers to collaboratively work on code. The primary benefit of GitHub is its version control system, which allows for seamless collaboration without compromising the integrity of the original project. The projects on GitHub are examples of open-source software.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Alexa must use pull command.
		git pull origin <branch_name>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Rebase
		GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		git pull origin Hulk (fetch and pull principle).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Everything understood
		It makes easy for many people to work on same project with much ease due to its various available functions.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Rebasing, Stashing
		Git and Github help us to contribute to open source projects. They give us an efficent way to share our code globally.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Hosting a website
		Git/github can be used to publish your work such as code for a website or app. This published code can be accessed by everyone and hence we can see the changes they have to offer for our code
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		merge
		GitHub hosts your source code projects in a variety of different programming languages and keeps track of the various changes made to every iteration. So, the “Git” implies the version control system; a tool which allows developers to keep track of the constant revisions to their code.