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
>
_______________________________________________
MediaWiki-l mailing list
To unsubscribe, go to:
https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
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
>
_______________________________________________
MediaWiki-l mailing list
To unsubscribe, go to:
https://lists.wikimedia.org/mailman/listinfo/mediawiki-l