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 thrown:
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
Sahaj Khandelwal
Hi and welcome Sahaj!
This does not sound like a question about MediaWiki (the topic of this mailing list), but about using Git in general. :) Also see https://www.mediawiki.org/wiki/How_to_become_a_MediaWiki_hacker#Feedback,_qu...
On Tue, 2020-02-11 at 20:43 +0530, sahaj khandelwal wrote:
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 thrown:
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.
See for example https://stackoverflow.com/questions/48602132/unable-to-merge-master-changes-... https://medium.com/@chongfai13/git-error-fatal-exiting-because-of-an-enresol... which are the first results I get in an internet search engine.
I would be glad if someone could help me with this issue
Please explain at which specific step in which tutorial (link) you are, and what exactly is unclear with the instructions in the error message.
Thanks a lot! andre
The command you are probably looking for is: git commit -a Which will locally mark all your changes as being ready.
Then do git show To see if your changes are what you expect them to be. If they are run the command: git push origin HEAD:refs/for/master
to upload your patch. (alternatively, use the command git review if you have it installed).
Hope that helps, and remember, if you mess anything up, everything is easy to undo. -- bawolff
On Tue, Feb 11, 2020 at 3:14 PM sahaj khandelwal ksahajk21@gmail.com wrote:
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 thrown:
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
Sahaj Khandelwal _______________________________________________ MediaWiki-l mailing list To unsubscribe, go to: https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
Hello everyone, To test one of the old featurrs and few bugs I wanted to downgrade my version of Page Forms extension. I wasn't able to find the old version repository. Would be glad if someone could help me with downgrading it. Thank you very much Sahaj Khandelwal
On Tue, 11 Feb 2020, 8:43 pm sahaj khandelwal, ksahajk21@gmail.com wrote:
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 thrown:
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
Sahaj Khandelwal
Hi,
On Tue, 2020-03-31 at 20:36 +0530, sahaj khandelwal wrote:
To test one of the old featurrs and few bugs I wanted to downgrade my version of Page Forms extension. I wasn't able to find the old version repository. Would be glad if someone could help me with downgrading it.
https://www.mediawiki.org/wiki/Extension:Page_Forms links to https://www.mediawiki.org/wiki/Extension:Page_Forms/Download_and_installatio...
If you have a Git download, then you can checkout a specific tag. See https://www.mediawiki.org/wiki/Download_from_Git#Switching_to_a_different_ve...
PS: Please do not reply to previous messages but start a new thread for a new topic. Please also strip unneeded quotes. Thanks a lot!
Cheers, andre
mediawiki-l@lists.wikimedia.org