Skip to content

Commit

Permalink
Added Guide.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
Chua123Yun committed Sep 4, 2024
1 parent 511bd12 commit 10907bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Guide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $ echo ‘info’ > test1.txt

2. Add files to the staging area and commit the changes.
$ git add .
$ git commit -m "Added txt file"
$ git commit -m Added txt file

Step 4. Push changes to GitHub
1. Push the branch and verify the push in Github.
Expand All @@ -48,7 +48,7 @@ $ git fetch upstream
$ git merge upstream/test

4. Resolves conflict and commit the changes
$ git add resolved-file.js $ git commit -m "Resolved conflicts"
$ git add resolved-file.js $ git commit -m Resolved conflicts

5. Push the merged branch.
$ git push origin test

0 comments on commit 10907bf

Please sign in to comment.