I don;t think there is any problem at that side. The way we discussed to update forks that day, worked for me just fine.
On Fri, Aug 14, 2015 at 1:52 AM, Deepak Sharma <deeky.sha...@gmail.com> wrote: > On Sun, Jul 26, 2015 at 4:51 PM, Deepak Sharma <deeky.sha...@gmail.com> > wrote: > > @Inderpreet > > > > I am facing merge conflicts in following files > > > > OGV/.meteor/release: needs update > > OGV/.meteor/versions: needs merge > > > > I updated these files according to my local files and then tried, git add > > but still facing them. Can you please look at it once and check what > > is the problem? > > Reply awaited! > > -- > Cheers! > > Deepak Kumar Sharma > Guru Nanak Dev Engineering College > India! > > Blog: http://deekysharma.wordpress.com > > > ------------------------------------------------------------------------------ > _______________________________________________ > BRL-CAD Developer mailing list > brlcad-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/brlcad-devel > -- Regards Shubham Chauhan 2013099 B.Tech CSE
------------------------------------------------------------------------------
_______________________________________________ BRL-CAD Developer mailing list brlcad-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-devel
