- You can fix the typos (if any) in any documentation of this repo.
- You can check for any unassigned issues and comment on that issue that you'd like to get that assigned to you. (Remember: Do not work on issues assigned to someone else and do not work on any issue without having it assigned to you.)
- Create issue if you see any bug and then once you get approved from the admins, you can assign yourself and start working on it.
Note: Steps 1, 2 and 3 are one-time steps required for setup. If you have already cloned the repo and added upstream, consider following this documentation from step 4.
- Forking repository
Fork this repository using the Fork option at the top-right corner of this page. This will create your own copy of this repository. You'll be redirected to your forked repository. Copy the link of this repository (which will look like https://github.com/<your-username>/website-www/) as you'll need it in the step 2.
- Cloning repository and Installing packages
Clone your forked repository, this will download your copy of repository in your computer. To do this, open your terminal (command prompt/bash/git bash) and enter the following command, paste your link after the word clone without the <>.
git clone <link which you copied in the step 1>
Once you have cloned the repository, now you should go into the folder containing the repository. You can do that with:
cd website-www
Now since we are migrating this project from Vanilla JS to emberJS we had to run the following command to switch to the ember branch to install the required packages.
git checkout develop-ember
Now you should install the required packages to run this project by doing:
yarn or yarn install
- Adding remote repository
Add the Real Dev Squad repository as a remote repository, so that you can anytime pull the latest changes from the Real Dev Squad repository which is being deployed. This needs to be done only for the first time.
git remote add upstream https://github.com/Real-Dev-Squad/website-www/
- Getting the latest code from the develop-ember branch (Can be skipped if you've cloned the repo just now)
If it's been quite a while after you have cloned the repo/made the last pull request, it's recommended to take a pull from the develop-ember branch after swithcing to develop-ember by command git checkout develop-ember. Reason being, there may be some changes which could have merged after you had cloned the repo/made the last pull request.
To do so, make sure you're in the develop-ember branch by checking out to the develop-ember branch:
git checkout develop-ember
Once you're in the develop-ember branch, it's time to take a pull:
git pull upstream develop-ember
Now that you've made sure that you've got latest changes, we can proceed to creating our branch
- Creating a new branch
Let's create a new branch to work on. We require a different branch so that we always have a stable, working version in the default (develop-ember) branch. We're not supposed to touch the main branch as it is the one getting deployed on production.
git checkout -b <branch-name>
We will try to name the branch according to the task we are going to perform in it. If it is going to be a feature, the branch name should begin with feat or feature. If it is going to be a fix, the branch name should begin with fix or bugfix. The branch name should be self-explanatory.
For example, if I want to work on a feature called login-form, the branch name will be feature/login-form. If it is going to be a fix in navbar, the branch name will be fix/navbar.
Command example:
git checkout -b feature/login-form
- Just do it!
Perform the tasks you wanted to, can be anything, ranging from fixing simple typo to re-designing the whole page!
- Committing your changes
Now you have made the changes, though they are saved in your system, Git doesn't know what changes you've done. So you have to commit your changes. First step is to add the files which you want to add to the staging area, the dot after add in the first command tells Git to check for changes in all the files. The second step is about committing your changes. The message part is short description of your commit, like "adds a login form on homepage". Please make sure NOT to have commit messages like "fix issue#34". When we look at the commit history, we should understand what a particular commit is supposed to do based on the commit message.
git add .
git commit -m "Write message about your commit"
- Making sure you have the latest changes from the develop-ember branch
It may so happen that since the last time you cloned the repo/took a pull from develop-ember, some changes may be merged in the develop-ember branch. So to be on the safer side, we should have those changes as well.
In order to do that, we first checkout to develop-ember branch by:
git checkout develop-ember
Once we're in develop-ember, it's time to take a pull:
git pull upstream develop-ember
Now that our local develop-ember branch is in sync with remote develop-ember branch (of the Real Dev Squad Repository), we should let our branch know about the changes from the develop-ember branch (if any). To do so we first checkout to our branch:
git checkout <branch-name>
Once we're in our branch, we rebase our branch on top of the current develop-ember branch (we change the base of our branch, so that it appears as if we have worked from the time the latest changes were merged in the develop-ember branch). To do so:
git rebase develop-ember
You should solve the merge conflicts, if any.
- Pushing the code
Now that we have made our changes plus we have the latest changes made by other contributors, we should push our code from local branch to the same branch on our GitHub fork. We do so by:
git push origin <branch-name>
For example, if the branch name is feat/login-form, we enter git push origin feat/login-form
The origin refers to your GitHub fork. You can check it by entering git remote -v, you should get the link to your fork against origin.
- Making a pull request
Your GitHub fork now has the changes, but you want those changes to be merged in the Real Dev Squad repository, right? There's a twist, you can't directly merge your code in the Real Dev Squad. Imagine you own a company whose code is open sourced, would you like if anyone could code make changes directly to the deployed branch without asking you? For the same reason, Pull Requests exist. You request the repository maintainers/admins to pull your code in their repository.
To make a pull request, go to your forked repository and you'll see had recent pushes less than a minute ago . Right next to it will be an option to Compare & pull request. Make sure the base branch is develop-ember while raising the pull requests. Click on it, submit your pull request (also known as PR) explaining what you've done. Again, the PR title should be self-explanatory but concise. If you want to write details, you can add it in the description. If you're making some UI (User Interface) changes, please make sure to add a short screen recording. If that's not possible, at least add some screenshots.
- Review stage
Now the maintainers/admins will review your pull request. They might suggest some changes if required. You should then make the required changes in the same branch, commit them and push your changes to the same branch (follow the steps 7, 8 and 9 for the same).
- Congratulations on your first Pull Request in Real Dev Squad! 🎉