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@kernelnewbies.org http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

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'