<div dir="ltr">Hi, <div><br></div><div>Could you try:</div><div><br style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px"><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">$ git remote update</span><br style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">$ git reset --hard origin/master</span><br></div><div><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px"><br></span></div>
<div><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">Thanks</span></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:06 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">
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>
</blockquote></div><br></div>