doubt with git and linux-next

doubt with git and linux-next

[Sudip Mukherjee]

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

doubt with git and linux-next

[Lucas Tanure]

Hi,

Could you try:

$ git remote update
$ git reset --hard origin/master

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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140725/eef44e66/attachment.html 

doubt with git and linux-next

[Sudip Mukherjee]

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
>
>

doubt with git and linux-next

[Lucas Tanure]

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.

--
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
> >
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140725/8faec6a3/attachment.html 

doubt with git and linux-next

[Sudip Mukherjee]

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.

>
> --
> 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
>> >
>> >
>
>

doubt with git and linux-next

[Valdis.Kletnieks at vt.edu]

On Fri, 25 Jul 2014 19:36:26 +0530, Sudip Mukherjee said:
> 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

git pull won't work the way you want on linux-next because of the way
it's built.

You want to do:

git clone   linus's tree
git remote add      linux-next tree

then to update, 'git remote update' instead of 'git pull'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 848 bytes
Desc: not available
Url : http://lists.kernelnewbies.org/pipermail/kernelnewbies/attachments/20140725/2d717b55/attachment.bin 

doubt with git and linux-next

[Sudip Mukherjee]

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
>>> >
>>> >
>>
>>