On Sat, Jul 11, 2015 at 4:08 PM, Shubham Chauhan <shubham13...@iiitd.ac.in> wrote: > 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.
I agree with him and facing the same. I couldn't find any alternative / solution for it. Please guide us to resolve. -- Cheers! Deepak Kumar Sharma Department of Information Technology Guru Nanak Dev Engineering College India! Blog: http://deekysharma.wordpress.com ------------------------------------------------------------------------------ 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
