<div dir="ltr"><div>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.</div></div><div class="gmail_extra"><br clear="all"><div><div dir="ltr">
<div>--</div>Lucas Tanure <br>+55 (19) 988176559<br></div></div>
<br><br><div class="gmail_quote">On Fri, Jul 25, 2014 at 11:14 AM, Sudip Mukherjee <span dir="ltr"><<a href="mailto:sudipm.mukherjee@gmail.com" target="_blank">sudipm.mukherjee@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="">On Fri, Jul 25, 2014 at 7:40 PM, Lucas Tanure <<a href="mailto:tanure@linux.com">tanure@linux.com</a>> wrote:<br>
> Hi,<br>
><br>
> Could you try:<br>
><br>
> $ git remote update<br>
> $ git reset --hard origin/master<br>
<br>
</div>then git pull master is not at all a necessary step ??<br>
<br>
I have mentioned in my mail that " then i used : git reset --hard<br>
<div class="">master , so now git status is showing<br>
"include/linux/mvebu-v7-cpuidle.h" as an untracked file ... "<br>
</div>but i have not modified that file .<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<br>
><br>
> Thanks<br>
><br>
> --<br>
> Lucas Tanure<br>
> <a href="tel:%2B55%20%2819%29%20988176559" value="+5519988176559">+55 (19) 988176559</a><br>
><br>
><br>
> On Fri, Jul 25, 2014 at 11:06 AM, Sudip Mukherjee<br>
> <<a href="mailto:sudipm.mukherjee@gmail.com">sudipm.mukherjee@gmail.com</a>> wrote:<br>
>><br>
>> Hi,<br>
>> I am having some doubt regarding git and how to sync my local copy<br>
>> with linux-next. I have cloned it and the next day if I want to sync<br>
>> my master with linux-next , i am using :<br>
>> git remote update<br>
>> git pull master<br>
>><br>
>> Then it is giving some messages about some conflicts. For example If i<br>
>> am trying to sync with todays tree (next-20140725) i got some<br>
>> conflicts. So to merge the conflicts I used<br>
>> git commit -a<br>
>> but then git status is showing "Your branch is ahead of<br>
>> 'master/master' by 271 commits"<br>
>> then i used : git reset --hard master , so now git status is showing<br>
>> "include/linux/mvebu-v7-cpuidle.h" as an untracked file ...<br>
>> Can you anyone please tell me what is the actual and proper way to<br>
>> sync with that days tree ..<br>
>><br>
>> Thanks in advance<br>
>> Sudip<br>
>><br>
>> _______________________________________________<br>
>> Kernelnewbies mailing list<br>
>> <a href="mailto:Kernelnewbies@kernelnewbies.org">Kernelnewbies@kernelnewbies.org</a><br>
>> <a href="http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies" target="_blank">http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies</a><br>
><br>
><br>
</div></div></blockquote></div><br></div>