Skip to content

Commit

Permalink
docs: added note for git reset
Browse files Browse the repository at this point in the history
  • Loading branch information
kuv2707 authored and Varun-Kolanu committed May 28, 2024
1 parent 0d43179 commit f828c52
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

---

# Contributing to Multiplayer UNO Game
Expand Down Expand Up @@ -91,7 +90,7 @@ If any merge conflicts occur, you will need to resolve them manually. Code edito
Now the local copy of the branch is synced with upstream/main. You need to force push these changes to origin, since the commit history has been rewritten.

```bash
git push origin <branch-name> --force
git push --force
```

### Editing commit history
Expand Down Expand Up @@ -135,7 +134,7 @@ After making the changes, you can continue the rebase process by running `git re

When there are no more commits left, the rebase process will be complete.

After all the commits have been applied, you can push the changes to your branch using `git push origin <branch-name> --force`. This will overwrite the commits in the remote branch in your forked repository with the changes you just made locally.
After all the commits have been applied, you can push the changes to your branch using `git push --force`. This will overwrite the commits in the remote branch in your forked repository with the changes you just made locally.

#### Tip
VSCode provides a helpful UI to perform these operations. You can set the default text editor for Git to VSCode by running the following command:
Expand Down
1 change: 1 addition & 0 deletions CONVENTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- Use meaningful commit messages that describe the changes made in the commit.
- Please do only one thing in a single commit. If you are fixing a bug and refactoring some code, make two separate commits.
- If you make tweaks to existing code to fit your implementation, do it in a separate commit.
- Your commits would be more readable if each line is limited to around 72 characters. Break long lines into multiple lines if necessary.
- Commit messages should be of the format:
```
<area_of_code>: <short_description>
Expand Down

0 comments on commit f828c52

Please sign in to comment.