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 < [email protected]> wrote: > On Fri, Jul 25, 2014 at 7:40 PM, Lucas Tanure <[email protected]> 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 > > <[email protected]> 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 > >> [email protected] > >> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies > > > > >
_______________________________________________ Kernelnewbies mailing list [email protected] http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies
