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
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
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
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
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
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,
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
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.
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
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
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
11 matches
Mail list logo