search

OSDLabs / WavesWebsite2016

The official repository of the site of Waves, the annual cultural fest of BITS Pilani, Goa. Made using Django Framework of Python for server side. Includes data porting using REST Framework to JSON to be accessible on the mobile app.
http://bits-waves.org
7 stars 10 forks source link

Mobile #21

Closed mukkachaitanya closed 8 years ago

mukkachaitanya commented 8 years ago

Merge this ! Conflict is from your side not mine.

SebastinSanty commented 8 years ago

There can't be conflict from my side.

mukkachaitanya commented 8 years ago

Even though it shows no conflicts ! 

C:\Users\mukka\Documents\Prgm\Waves2k16\Waves-Website\waves\src>git pull --rebase origin master
From https://github.com/SebastinSanty/WavesWebsite2016
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Local Environment Settings changed (Issue #9)
Applying: README Updated
Applying: FrontEnd changes
Applying: Mobile site and Updates
SebastinSanty commented 8 years ago

How come you are having 4 commits?

mukkachaitanya commented 8 years ago

And a totally different commit history on my PC.

commit e695b0f070ffb570f69cd3a64bbbdcace72a6785
Author: mukkachaitanya <chaitanya.mvs2007@gmail.com>
Date:   Tue Oct 4 16:35:41 2016 +0530

    Mobile site and Updates

commit 8737dc05e583bb9f4a85af7ce0e39565b89419ba
Author: mukkachaitanya <chaitanya.mvs2007@gmail.com>
Date:   Mon Sep 26 13:30:10 2016 +0530

    FrontEnd changes

commit 3186d3b52c7ef29317b6b5d81c07e1ab3f42e660
Author: Sebastin Santy <sebastinssanty@gmail.com>
Date:   Mon Sep 26 22:21:45 2016 +0530

    README Updated

commit af3ac6c5971943bf1070321e85a36836b2e489d2
Author: Sebastin Santy <sebastinssanty@gmail.com>
Date:   Mon Sep 26 19:09:14 2016 +0530

    Local Environment Settings changed (Issue #9)
mukkachaitanya commented 8 years ago

FrontEnd changes are from the earlier PR #14 . I didn't squash them to keep originality.