[Wikitech-l] Git - I just want to pull the HEAD version
Ok, I don't get it. All the time I do a pull I get conflicts. Latest just now: CONFLICT (delete/modify): includes/api/ApiTokens.php deleted in HEAD and modified in 4cee7f1bb6f5b40134f211a626fd70504fc216dd. Version 4cee7f1bb6f5b40134f211a626fd70504fc216dd of includes/api/ApiTokens.php left in tree. Also the IDE I use (Netbeans) shows loads of local changes I never did. Can somebody please enlighten me on how to just pull the latest HEAD version, no questions asked?! Thanks, Stephan ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
On Sat, Apr 28, 2012 at 8:29 AM, Stephan Gambke s7ep...@gmail.com wrote: Can somebody please enlighten me on how to just pull the latest HEAD version, no questions asked?! If you've cloned MediaWiki core: `git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git` Then staying up to date is just: `git pull origin master` If you start changing files or trying to merge branches then you run the risk of getting conflicts, but there's zero reason a simple clone pull would conflict. -Chad ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
Am 28.04.2012 14:37, schrieb Chad: If you start changing files or trying to merge branches then you run the risk of getting conflicts... Even on files I did not even touch? ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
On Sat, Apr 28, 2012 at 8:42 AM, Stephan Gambke s7ep...@gmail.com wrote: Am 28.04.2012 14:37, schrieb Chad: If you start changing files or trying to merge branches then you run the risk of getting conflicts... Even on files I did not even touch? If you didn't touch them, then I don't know how there would be a conflict. -Chad ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
Am 28.04.2012 14:43, schrieb Chad: If you didn't touch them, then I don't know how there would be a conflict. Me neither. That's why I asked. Will try to start over with a fresh clone. Thanks anyway. Cheers, Stephan ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
On Sat, 28 Apr 2012 05:45:54 -0700, Stephan Gambke s7ep...@gmail.com wrote: Am 28.04.2012 14:43, schrieb Chad: If you didn't touch them, then I don't know how there would be a conflict. Me neither. That's why I asked. Will try to start over with a fresh clone. Thanks anyway. Cheers, Stephan What is the diff? By any chance do you still have svn attached? -- ~Daniel Friesen (Dantman, Nadir-Seen-Fire) [http://daniel.friesen.name] ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Git - I just want to pull the HEAD version
Am 28.04.2012 21:09, schrieb Daniel Friesen: What is the diff? By any chance do you still have svn attached? Sorry, don't have the files anymore. But no, no it was a clone from git. Have a different setup now and so far it seems to work. Cheers, Stephan ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
[Wikitech-l] Informal English lessons for Wikimedia developers - May 5 or 6
Some Wikimedia developers have requested help improving their English writing skills. Erika Hanson is volunteering her proofreading skills to help by leading interactive proofreading sessions -- we ran a pilot today and it was successful enough that we'll do another one next weekend. Participants paste what they've written into the Etherpad http://notes.wikimediadc.org/p/english-lessons by Thursday night, so Erika has time to read it and mark problem areas in boldface. Then, during the tutorial session, Erika gives the learner lessons in spelling, grammar, punctuation, etc., for about 15 minutes per student. If she has time in the 15 min., she'll then move on to matters of style. Discussion can be within the Etherpad chat. If you want to participate, email Erika (cc'd) with the date/times that you can attend (your 2 choices are below - I don't know whether Erika can do both times or just the more popular 1), and put something you've written into the Etherpad by the end of Thursday. It should be at least 200 words long -- blog entry, email, school essay, whatever. ALBUQUERQUE, 1:30pm-3:30pm , Sat, May 5 2012 UTC, 19:30-21:30 Sat, May 5 2012 AMSTERDAM, 21:30-23:30 Sat, May 5 2012 MUMBAI, 1am-3am Sun, May 6 2012 or ALBUQUERQUE, 10am-noon, Sun, May 6 2012 MUMBAI, 9:30pm-11:30pm, Sun, May 6 2012 UTC, 16:00-18:00, Sun, May 6 2012 AMSTERDAM, 18:00-20:00, Sun, May 6 2012 If people learn effectively from this, then we could repeat it. -- Sumana Harihareswara Engineering Community Manager Wikimedia Foundation ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Informal English lessons for Wikimedia developers - May 5 or 6
This initiative would be helpful not just for developers (and thanks for this possibility Erika, Sumana in the name of developers). I would surely participate in a similar lesson... Samat On Sun, Apr 29, 2012 at 00:00, Sumana Harihareswara suma...@wikimedia.orgwrote: Some Wikimedia developers have requested help improving their English writing skills. Erika Hanson is volunteering her proofreading skills to help by leading interactive proofreading sessions -- we ran a pilot today and it was successful enough that we'll do another one next weekend. Participants paste what they've written into the Etherpad http://notes.wikimediadc.org/p/english-lessons by Thursday night, so Erika has time to read it and mark problem areas in boldface. Then, during the tutorial session, Erika gives the learner lessons in spelling, grammar, punctuation, etc., for about 15 minutes per student. If she has time in the 15 min., she'll then move on to matters of style. Discussion can be within the Etherpad chat. If you want to participate, email Erika (cc'd) with the date/times that you can attend (your 2 choices are below - I don't know whether Erika can do both times or just the more popular 1), and put something you've written into the Etherpad by the end of Thursday. It should be at least 200 words long -- blog entry, email, school essay, whatever. ALBUQUERQUE, 1:30pm-3:30pm , Sat, May 5 2012 UTC, 19:30-21:30 Sat, May 5 2012 AMSTERDAM, 21:30-23:30 Sat, May 5 2012 MUMBAI, 1am-3am Sun, May 6 2012 or ALBUQUERQUE, 10am-noon, Sun, May 6 2012 MUMBAI, 9:30pm-11:30pm, Sun, May 6 2012 UTC, 16:00-18:00, Sun, May 6 2012 AMSTERDAM, 18:00-20:00, Sun, May 6 2012 If people learn effectively from this, then we could repeat it. -- Sumana Harihareswara Engineering Community Manager Wikimedia Foundation ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] Informal English lessons for Wikimedia developers - May 5 or 6
Samat - yes, I know this would be useful for a lot of people, but since this particular volunteer only has a limited amount of time and wants to learn more about software development, I'm choosing to ask her to specifically help our developer community. You can email Erika (cc'd) to let her know which sessions you could attend. -- Sumana Harihareswara Engineering Community Manager Wikimedia Foundation On 04/28/2012 06:11 PM, Samat wrote: This initiative would be helpful not just for developers (and thanks for this possibility Erika, Sumana in the name of developers). I would surely participate in a similar lesson... Samat On Sun, Apr 29, 2012 at 00:00, Sumana Harihareswara suma...@wikimedia.orgwrote: Some Wikimedia developers have requested help improving their English writing skills. Erika Hanson is volunteering her proofreading skills to help by leading interactive proofreading sessions -- we ran a pilot today and it was successful enough that we'll do another one next weekend. Participants paste what they've written into the Etherpad http://notes.wikimediadc.org/p/english-lessons by Thursday night, so Erika has time to read it and mark problem areas in boldface. Then, during the tutorial session, Erika gives the learner lessons in spelling, grammar, punctuation, etc., for about 15 minutes per student. If she has time in the 15 min., she'll then move on to matters of style. Discussion can be within the Etherpad chat. If you want to participate, email Erika (cc'd) with the date/times that you can attend (your 2 choices are below - I don't know whether Erika can do both times or just the more popular 1), and put something you've written into the Etherpad by the end of Thursday. It should be at least 200 words long -- blog entry, email, school essay, whatever. ALBUQUERQUE, 1:30pm-3:30pm , Sat, May 5 2012 UTC, 19:30-21:30 Sat, May 5 2012 AMSTERDAM, 21:30-23:30 Sat, May 5 2012 MUMBAI, 1am-3am Sun, May 6 2012 or ALBUQUERQUE, 10am-noon, Sun, May 6 2012 MUMBAI, 9:30pm-11:30pm, Sun, May 6 2012 UTC, 16:00-18:00, Sun, May 6 2012 AMSTERDAM, 18:00-20:00, Sun, May 6 2012 If people learn effectively from this, then we could repeat it. -- Sumana Harihareswara Engineering Community Manager Wikimedia Foundation ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
[Wikitech-l] git reading tips
I like that http://sitaramc.github.com/gcs/index.html and that http://sitaramc.github.com/concepts/detached-head.html ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
