diff --git a/README.md b/README.md index b1034661..fcb557ae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Introduction to Git and GitHub -## Simple Interest Calculator +## Simple Interest Calculator (Updated) A calculator that calculates simple interest given principal, annual rate of interest and time period in years. diff --git a/bug-fix-revert b/bug-fix-revert new file mode 100644 index 00000000..b80a2b74 --- /dev/null +++ b/bug-fix-revert @@ -0,0 +1,3 @@ +$ curl https://api.github.com/repos/arjyalopa/mcino-Introduction-to-Git-and-GitHub/pulls + + diff --git a/forked-repo b/forked-repo new file mode 100644 index 00000000..18801e40 --- /dev/null +++ b/forked-repo @@ -0,0 +1,8 @@ +curl -s https://api.github.com/repos/arjyalopa/mcino-Introduction-to-Git-and-GitHub + +{ + "fork": true, + "parent": { + "full_name": "ibm-developer-skills-network/mcino-Introduction-to-Git-and-GitHub" + } +} diff --git a/github-branches b/github-branches new file mode 100644 index 00000000..106fcd79 --- /dev/null +++ b/github-branches @@ -0,0 +1,3 @@ +$ git branch -v + bug-fix-typo ae281e4 Fix typo in README +* main f9a11d2 Verify pull request and fork source using curl \ No newline at end of file diff --git a/merge_branches b/merge_branches new file mode 100644 index 00000000..edb10306 --- /dev/null +++ b/merge_branches @@ -0,0 +1,16 @@ +$ git checkout -b bug-fix-typo +Switched to a new branch 'bug-fix-typo' + +$ git add README.md +$ git commit -m "Fix typo in README" +1 file changed, 1 insertion(+), 1 deletion(-) + +$ git checkout main +Switched to branch 'main' +Your branch is up to date with 'origin/main'. + +$ git merge bug-fix-typo +Updating e095add..ae281e4 +Fast-forward +README.md | 2 +- +1 file changed, 1 insertion(+), 1 deletion(-)