On Fri, Aug 14, 2015 at 1:52 AM, Deepak Sharma wrote:
> Reply awaited!
Hi deepak,
Nothing from my side. If you are facing merge conflicts and don't know
how to solve them, you can google a bit (it's easy) and still if
needed we can set time and discuss on IRC. Being able to use git (or
similar s
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
wrote:
> On Sun, Jul 26, 2015 at 4:51 PM, Deepak Sharma
> wrote:
> > @Inderpreet
> >
> > I am facing merge conflicts in followi
On Sun, Jul 26, 2015 at 4:51 PM, Deepak Sharma 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. Ca
On Sat, Jul 25, 2015 at 11:07 PM, Inderpreet Singh wrote:
> I have merged your changes into two branches
> * GSOC2015
> * GSOC2015-merged
@Inderpreet
I am facing merge conflicts in following files
OGV/.meteor/release: needs update
OGV/.meteor/versions: needs merge
I updated these files accordi
On Sun, Jul 26, 2015 at 12:11 PM, Shubham Chauhan
wrote:
> Where are the comments that you are referring to here?
I mean, I have commented out some code that conflicted between yours
and deepak's. Also you will be getting comments on your commits on
specific files. If you have subscribed to githu
>
> I have merged your changes into two branches
> * GSOC2015
> * GSOC2015-merged
>
> While GSOC2015 contained changes only from shubham, the merged branch
> contain changes from both PRs. Please read again the guide
> (requirements) that you got for GSoC and the coding standard
> guidelines. Ther
On Mon, Jul 20, 2015 at 3:00 AM, Inderpreet Singh wrote:
>
> 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 m
Tonight 11 PM
--
___
BRL-CAD Developer mailing list
brlcad-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-devel
@Shubham
Time is running out, we need to talk to take further step for OGV.
Please tell me when will be you free so that we can discuss things.
--
___
BRL-CAD Developer mailing
On Wed, Jul 15, 2015 at 12:25 AM, Deepak Sharma 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 tim
On Sat, Jul 11, 2015 at 4:08 PM, Shubham Chauhan
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).
>
> Me
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
On Fri, Jul 10, 2015 at 7:58 PM, Shubham Chauhan
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
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 w
On Wed, Jul 8, 2015 at 8:13 PM, Deepak Sharma wrote:
> @Sean @Inderpreet @Harmanpreet
>
> Please merge my and Shubam's commits as mid term is over and we are
> almost done with our work. The focus is now making OGV production
> ready, so there is a need to merge our commits else at the end there
>
@Sean @Inderpreet @Harmanpreet
Please merge my and Shubam's commits as mid term is over and we are
almost done with our work. The focus is now making OGV production
ready, so there is a need to merge our commits else at the end there
will be lot of problem. It is my request to spare little time an
16 matches
Mail list logo
