From df923226fca7128d54671f8f95889c0837b25eff Mon Sep 17 00:00:00 2001 From: ALOK SINGH <107742899+aloki9singh@users.noreply.github.com> Date: Tue, 30 May 2023 20:08:25 +0530 Subject: [PATCH 1/4] commit 1 --- README.md | 3 +++ src/sample/java/project/HelloWorld.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9aa7c528..29ae7326 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,6 @@ environment set up -- one that works across many projects -- should be able to clone the repository and do a build simply by running the build program with no special arguments. There should be no need to edit or install anything into the project space for the initial build. + + +# This is the change diff --git a/src/sample/java/project/HelloWorld.java b/src/sample/java/project/HelloWorld.java index d851ea6b..3c68ec63 100644 --- a/src/sample/java/project/HelloWorld.java +++ b/src/sample/java/project/HelloWorld.java @@ -2,6 +2,6 @@ class HelloWorld{ public static void main(String args[]){ - System.out.println("Hello World..."); + System.out.println("Hello World!"); } } From bcb711a14432956cb09087fe9f3b29bdf7d7b98f Mon Sep 17 00:00:00 2001 From: ALOK SINGH <107742899+aloki9singh@users.noreply.github.com> Date: Tue, 30 May 2023 20:09:40 +0530 Subject: [PATCH 2/4] commit 2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29ae7326..ac6c66f8 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,4 @@ build program with no special arguments. There should be no need to edit or install anything into the project space for the initial build. -# This is the change +# This is the change which is updated twice.. From 05a6bdc7e0bf2da4117b4734d70ce41739c4b3b7 Mon Sep 17 00:00:00 2001 From: ALOK SINGH <107742899+aloki9singh@users.noreply.github.com> Date: Tue, 30 May 2023 20:23:28 +0530 Subject: [PATCH 3/4] branch1 added --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ac6c66f8..99df00b0 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,4 @@ edit or install anything into the project space for the initial build. # This is the change which is updated twice.. + `branch1 is created` From 55f31be04b2e50f38cf71c49d9f075c62dba56cd Mon Sep 17 00:00:00 2001 From: ALOK SINGH <107742899+aloki9singh@users.noreply.github.com> Date: Tue, 30 May 2023 23:08:19 +0530 Subject: [PATCH 4/4] solution file --- README.md | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99df00b0..60003986 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ your passphrase a bunch of times in a row. I hate coding absolute paths in my build script and I hate including built files as part of the base project. My philosophy is that the -*environment* should be set up so that the tool can easily find the +_environment_ should be set up so that the tool can easily find the external resources they need (JUnit, etc.) from the system or dependency manager. It's the system or dependency manager that provides the libraries. Anyone who has the proper development @@ -51,6 +51,87 @@ able to clone the repository and do a build simply by running the build program with no special arguments. There should be no need to edit or install anything into the project space for the initial build. - # This is the change which is updated twice.. - `branch1 is created` + +`branch1 is created` +$ git --version + +# clone repo + +git clone https://github.com/aloki9singh/sample-java-project.git + +# move to that directory + +cd sample-java-project + +# list all folders + +ls + +# list all folders including hidden files + +ls --al + +# status of staged commit and modified + +git status + +# staged + +git add . + +# commit files + +$ git commit -m"commit 1" + +# pushed to repo master + +$ git push origin master + +# status of staged commit and modified + +$ git status + +$ git add . + +# again commit + +$ git commit -m"commit 2" + +$ git push origin master + +# logs of commit + +$ git log + +# last commits one line + +$ git log -oneline + +# last five commits one line + +$ git log --oneline -n 5 + +# new branch created name branch1 + +$ git branch branch1 + +# checking on branch1 + +$ git checkout branch1 + +# again stage + +$ git add . + +# commit files modified + +$ git commit -m"branch1added" + +# pushed to branch + +$ git push origin branch1 + +# merged in forked repo + +