It's impossible to provide ready to merge pull requests. We can't see
what's causing the conflicts. These conflicts will arise between front-end
and backend work as well (and not only front-end vs master and backend vs
master).
Merge conflicts will need to be resolved. That's why merging our work and
working in the main branch together was a main issue for me and deepak as
well.
On Jul 10, 2015 11:23 PM, "Inderpreet Singh" <indrp...@gmail.com> wrote:
> On Fri, Jul 10, 2015 at 7:58 PM, Shubham Chauhan
> <shubham13...@iiitd.ac.in> wrote:
> > I have opened up pull requests in the master branch and the gsoc2015
> branch
> > as well by the name 'backend'.
> > The merge conflicts that might appear will be really less (most likely in
> > the packages folder). I don't think it will take much of a time.
> > Also merging is really important because my backend work requires urgent
> > frontend finishing.
>
> Please look into those conflicts, and send me readily merge-able pull
> requests. I will review code but that will take time and it's urgent
> for you and deepak to work on single codebase or the differences in
> your both's code will make things more difficult.
>
> > Also, @Inder, if you have some time, please read the mail by the subject
> > "OGV: Color in models" (in particular Sean's reply). The very recent one.
>
> Yeah, I have seen that mail. The command is as new to me as it's to
> you. I will look into it once I get time and respond If I find
> anything. You should keep looking.
>
>
> --
> Inderpreet Singh
>
> Ekoankar Sahai
> ishwerdas.com
> facebook.com/okayinder
> https://kippt.com/okayinder
>
>
> ------------------------------------------------------------------------------
> Don't Limit Your Business. Reach for the Cloud.
> GigeNET's Cloud Solutions provide you with the tools and support that
> you need to offload your IT needs and focus on growing your business.
> Configured For All Businesses. Start Your Cloud Today.
> https://www.gigenetcloud.com/
> _______________________________________________
> BRL-CAD Developer mailing list
> brlcad-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/brlcad-devel
>
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Developer mailing list
brlcad-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-devel
