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(a)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