Skip to content

hazraChandrima/pcon-workshop

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

27 Commits
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Dev Tips – A Collaborative Repository for Developers

What You'll Learn

  • How to fork a repository
  • How to clone and branch
  • How to make commits and push changes
  • How to create a Pull Request
  • How to resolve merge conflicts

🗂️ Repository Structure

dev-tips/
└── tips.md
└── contributors.md
└── README.md
└── .gitignore

How to Contribute

Follow these steps carefully

1. Fork this repository

Click the Fork button at the top right of this page.
This creates a copy of this repo under your GitHub account. Your fork will look like:

https://github.com/<your-username>/dev-tips

2. Clone your fork using SSH

Note: Make sure you have SSH keys set up with GitHub. If not, follow GitHub's SSH setup guide.

Open a terminal and run:

git clone git@github.com:<your-username>/dev-tips.git

Then navigate into the folder:

cd dev-tips

3. Create a new branch

Always create a new branch for your changes:

git checkout -b add-my-tip

4. Add your tip in tips.md

Add your tip at the bottom of the file like this:

- Always write meaningful commit messages. *(Added by Chandrima Hazra)*

Then, add your name to the contributors.md file:

- Chandrima Hazra

5. Commit your changes

git add .
git commit -m "<commit message here>"

6. Push your branch

git push origin add-my-tip

7. Create a Pull Request

  1. Go to your fork on GitHub.
  2. You'll see a prompt to "Compare & pull request".
  3. Click it, add a short description, and submit your PR.

Wait for the maintainer to review and merge your contribution. A PR should have a proper description of the changes to make it easy for the maintainers to understand your changes.


⚠️ Handling Merge Conflicts

If you see a merge conflict:

  1. Pull the latest main branch:

    git pull upstream main
  2. Resolve conflicts manually in your file.

  3. Add and commit again:

    git add .
    git commit -m "Resolved conflict"
    git push origin add-my-tip

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 7