Resurgence is the Annual Cultural-fest of Shri Mata Vaishno Devi University
JavaScript HTML ApacheConf CSS PHP
Switch branches/tags
Nothing to show
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
app
test
.bowerrc
.editorconfig
.gitattributes
.gitignore
.jshintrc
.travis.yml
Gruntfile.js
README.md
bower.json
package.json

README.md

Resurgence 2k15

The Official repository for Resurgence - SMVDU, to be held in April, 2015.

Resurgence is the Annual Cultural Festival of Shri Mata Vaishno Devi University. The work for the development of Official website is done every year in this repository. You can find the earlier websites in the old Branch. Resurgence is one of the Biggest Cultural-fest of North India.

This README file contain all the information you need to start contributing to this repo. If you are still facing any difficulty with the code or setup then simply create an Issue. We'll be happy to help.

Run Locally

Use git clone to clone this repo to your local machine:

git clone https://github.com/smvdu/Resurgence-website.git

`cd` into cloned repo: ``` cd Resurgence-website ```
Install all the dependencies using `npm install`: ``` sudo npm install ```
Install all the `bower` packages: ``` bower install ```
Run the Server using `grunt`: ``` grunt serve ``` **NOTE:** You should have grunt-cli installed globally to run the above command .If not installed run: ``` npm install -g grunt-cli ```

Contribution Guidelines

Fork this repository to your account, using the Fork button on the top right corner.

Use git clone to clone your forked repo to your local machine: (replace 'your_username' with appropriate value)

git clone https://github.com/your_username/Resurgence-website.git

`cd` into cloned repo: ``` cd Resurgence-website ```
Install all the dependencies using `npm install`: ``` sudo npm install ```
Install all the `bower` packages: ``` bower install ```
Run the Server using `grunt`: ``` grunt serve ```
Set the `upstream` to this repo:

The easiest way is to use the https url:

git remote add upstream https://github.com/smvdu/Resurgence-website.git

or if you have ssh set up you can use that url instead:

git remote add upstream git@github.com:smvdu/Resurgence-website.git

Working branch for **Resurgence-website** will always be the `develop` branch. Hence, all the latest code will always be on the *develop* branch. You should always create a new branch for any new piece of work branching from *develop* branch: ``` git branch new_branch ``` **NOTE:** You must not mess with `master` branch or bad things will happen. *master* branch contains the latest stable code, so just leave it be.

Before starting any new piece of work, move to develop branch:

git checkout develop

Now you can fetch latest changes from main repo using: ``` git fetch upstream ```
`merge` the latest code with *develop* branch: ``` git merge upstream/develop ```
`checkout` to your newly created branch: ``` git checkout new_branch ```
Rebase the code of *new_branch* from the code in *develop* branch, run the `rebase` command from your current branch: ``` git rebase develop ``` Now all your changes on your current branch will be based on the top of the changes in *develop* branch.

Push your changes to your forked repo

git push origin new_branch

Now, you can simply send the Pull Request to Parent Repo from within the Github.

Always squash up your commits into a single commit before sending the Pull Request. Use git rebase -i for this purpose. For example to squash last 3 commits into a single commit, simply run:

git rebase -i HEAD~3

####Happy Coding :)