On Wed, Jul 15, 2015 at 12:25 AM, Deepak Sharma <deeky.sha...@gmail.com> wrote: > > I agree with him and facing the same. I couldn't find any alternative > / solution for it. Please guide us to resolve.
The only solution is to keep resolving merge conflicts until you both have the same code base. Which will take some time for me to do (my tiny startup consumes a hell lot of my time) If you are working any further, can you please make sure your codes are in sync with each other. Just choose one single codebase anywhere (not necessarily on brl-cad account) and make sure your code doesn't drift far away from each other. -- 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
