* doubt with git and linux-next @ 2014-07-25 14:06 Sudip Mukherjee 2014-07-25 14:10 ` Lucas Tanure 2014-07-25 17:30 ` Valdis.Kletnieks at vt.edu 0 siblings, 2 replies; 7+ messages in thread From: Sudip Mukherjee @ 2014-07-25 14:06 UTC (permalink / raw) To: kernelnewbies 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:06 doubt with git and linux-next Sudip Mukherjee @ 2014-07-25 14:10 ` Lucas Tanure 2014-07-25 14:14 ` Sudip Mukherjee 2014-07-25 17:30 ` Valdis.Kletnieks at vt.edu 1 sibling, 1 reply; 7+ messages in thread From: Lucas Tanure @ 2014-07-25 14:10 UTC (permalink / raw) To: kernelnewbies 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:10 ` Lucas Tanure @ 2014-07-25 14:14 ` Sudip Mukherjee 2014-07-25 14:22 ` Lucas Tanure 0 siblings, 1 reply; 7+ messages in thread From: Sudip Mukherjee @ 2014-07-25 14:14 UTC (permalink / raw) To: kernelnewbies 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 > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:14 ` Sudip Mukherjee @ 2014-07-25 14:22 ` Lucas Tanure 2014-07-25 14:25 ` Sudip Mukherjee 0 siblings, 1 reply; 7+ messages in thread From: Lucas Tanure @ 2014-07-25 14:22 UTC (permalink / raw) To: kernelnewbies 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:22 ` Lucas Tanure @ 2014-07-25 14:25 ` Sudip Mukherjee 2014-07-28 12:27 ` Sudip Mukherjee 0 siblings, 1 reply; 7+ messages in thread From: Sudip Mukherjee @ 2014-07-25 14:25 UTC (permalink / raw) To: kernelnewbies 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 >> > >> > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:25 ` Sudip Mukherjee @ 2014-07-28 12:27 ` Sudip Mukherjee 0 siblings, 0 replies; 7+ messages in thread From: Sudip Mukherjee @ 2014-07-28 12:27 UTC (permalink / raw) To: kernelnewbies 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 >>> > >>> > >> >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* doubt with git and linux-next 2014-07-25 14:06 doubt with git and linux-next Sudip Mukherjee 2014-07-25 14:10 ` Lucas Tanure @ 2014-07-25 17:30 ` Valdis.Kletnieks at vt.edu 1 sibling, 0 replies; 7+ messages in thread From: Valdis.Kletnieks at vt.edu @ 2014-07-25 17:30 UTC (permalink / raw) To: 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' -------------- 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 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-28 12:27 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-25 14:06 doubt with git and linux-next Sudip Mukherjee 2014-07-25 14:10 ` Lucas Tanure 2014-07-25 14:14 ` Sudip Mukherjee 2014-07-25 14:22 ` Lucas Tanure 2014-07-25 14:25 ` Sudip Mukherjee 2014-07-28 12:27 ` Sudip Mukherjee 2014-07-25 17:30 ` Valdis.Kletnieks at vt.edu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).