I started working on the task https://phabricator.wikimedia.org/T244730,
to push the changes, I followed the steps given in the Gerrit tutorial. But
when I run the command *git pull origin master,* the following error is
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
I would be glad if someone could help me with this issue
Thanks in advance
Registration is open for EMWCon 2020 , the Enterprise MediaWiki
You must register by March 2nd to be able to attend the tour of NASA's Plum
Brook Station  and other pre-planned conference events.
Talks are still being accepted . Please help us design a well-planned
program by submitting your talk proposals as soon as possible but no later
than March 16.
The conference will be held on April 1-3 in Sandusky, Ohio (50 miles west
of Cleveland). EMWCon is a three-day conference featuring discussions of
topics related to "Enterprise MediaWiki", i.e. the usage of MediaWiki
software by and within companies, non-profits, governments, and other
organizations. The intended audience of EMWCon Spring 2020 is anyone who
uses, or would like to learn to more about, MediaWiki. This year the
conference will be preceded by an optional, informal two day hackathon on
March 30 and 31. The conference venue is located across the street from
NASA's Plum Brook Station, where NASA Orion Spacecraft is presently being
tested for the Artemis-1 mission to the moon.
The EMWCon 2020 organizing committee
* Richard Evans (General Chair)
* Yaron Koren (Registration Chair and Principal Sponsor)
* Cindy Cicalese (Program Chair)
Yesterday a new episode of the MediaWiki podcast "Between the Brackets" was
released: an interview with Trevor Parscal, whom probably many of you know
as a former Wikimedia Foundation developer, and who now works for wikiHow.
This was the longest episode yet (2 hours), because there was a lot for us
to talk about. You can listen to the episode here: