These are chat archives for CF711/facebookProject

8th
Apr 2015
towhidabsar
@towhidabsar
Apr 08 2015 22:47
@/all was I supposed to push into develop or master?
shit I just pushed my changes into master
Robert Warren Gilmore
@RobertWarrenGilmore
Apr 08 2015 23:02
We voted in class and settled on merging our features into develop.
Just be sure to pull first and resolve any merge conflicts before you merge your stuff in.
Then, once develop looks good, we'll merge it into master. That will not happen very often, though, so try to integrate your work into develop.
towhidabsar
@towhidabsar
Apr 08 2015 23:04
Ok I will double check and merge it into develop.