doubt with git and linux-next

From: sudipm.mukherjee@gmail.com (Sudip Mukherjee)
To: kernelnewbies@lists.kernelnewbies.org
Subject: doubt with git and linux-next
Date: Mon, 28 Jul 2014 17:57:36 +0530	[thread overview]
Message-ID: <CADVatmPMaHt3BKfsYJuRM1cSj3epSNLiMsDGYXEaQkdMGjKuvg@mail.gmail.com> (raw)
In-Reply-To: <CADVatmM-tOfoH7mZKoadOH9nJbunH39YBqF4Rjvb8XYFL4+xLg@mail.gmail.com>

On Fri, Jul 25, 2014 at 7:55 PM, Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
> On Fri, Jul 25, 2014 at 7:52 PM, Lucas Tanure <tanure@linux.com> wrote:
>> I had the same issue. I cloned a new one, and every time that I need to
>> update I do those commands, and now I never got the issue again.
>
> Thanks. will check tomorrow if i dont use git pull and only use git
> remote update and git reset --hard master then the issue is coming or
> not.
>

Thanks again. It has worked perfectly . No issues this time .

>>
>> --
>> Lucas Tanure
>> +55 (19) 988176559
>>
>>
>> On Fri, Jul 25, 2014 at 11:14 AM, Sudip Mukherjee
>> <sudipm.mukherjee@gmail.com> wrote:
>>>
>>> On Fri, Jul 25, 2014 at 7:40 PM, Lucas Tanure <tanure@linux.com> wrote:
>>> > Hi,
>>> >
>>> > Could you try:
>>> >
>>> > $ git remote update
>>> > $ git reset --hard origin/master
>>>
>>> then git pull master is not at all a necessary step ??
>>>
>>> I have mentioned in my mail that " then i used  : git reset --hard
>>> master , so now git status is showing
>>>  "include/linux/mvebu-v7-cpuidle.h"  as an untracked file ... "
>>> but i have not modified that file .
>>>
>>>
>>>
>>>
>>> >
>>> > Thanks
>>> >
>>> > --
>>> > Lucas Tanure
>>> > +55 (19) 988176559
>>> >
>>> >
>>> > On Fri, Jul 25, 2014 at 11:06 AM, Sudip Mukherjee
>>> > <sudipm.mukherjee@gmail.com> wrote:
>>> >>
>>> >> Hi,
>>> >> I am having some doubt regarding git and how to sync my local copy
>>> >> with linux-next. I have cloned it and the next day if I want to sync
>>> >> my master with linux-next , i am using :
>>> >> git remote update
>>> >> git pull master
>>> >>
>>> >> Then it is giving some messages about some conflicts. For example If i
>>> >> am trying to sync with todays tree (next-20140725) i got some
>>> >> conflicts. So to merge the conflicts I used
>>> >> git commit -a
>>> >> but then git status is showing "Your branch is ahead of
>>> >> 'master/master' by 271 commits"
>>> >> then i used  : git reset --hard master , so now git status is showing
>>> >> "include/linux/mvebu-v7-cpuidle.h"  as an untracked file ...
>>> >> Can you anyone please tell me what is the actual and proper way to
>>> >> sync with that days tree ..
>>> >>
>>> >> Thanks in advance
>>> >> Sudip
>>> >>
>>> >> _______________________________________________
>>> >> Kernelnewbies mailing list
>>> >> Kernelnewbies at kernelnewbies.org
>>> >> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
>>> >
>>> >
>>
>>