archanaserver | hi vkmc, o/ | 08:39 |
---|---|---|
archanaserver | I'm facing this gerrit error -> http://paste.openstack.org/show/807051/ I have tried to commit the changes by removing change id but getting the same error | 08:39 |
archanaserver | also i found this regarding this gerrit error -> https://git.eclipse.org/r/Documentation/error-not-allowed-to-upload-merges.html | 08:39 |
vkmc | archanaserver, hi archana! | 08:45 |
vkmc | did you git merge something? | 08:45 |
vkmc | you can check by looking at the git log | 08:45 |
archanaserver | not I didn't git merge | 08:46 |
archanaserver | but I can see my changes in git log | 08:46 |
vkmc | archanaserver, can you share a tmate with me? | 08:47 |
archanaserver | sure, in a minute | 08:47 |
archanaserver | ssh session: ssh EA8cx5udTXWMGCtXRTADCZmjf@sfo2.tmate.io | 08:48 |
vkmc | joining | 08:49 |
vkmc | hmm, I don't see a commit in that branch | 08:51 |
vkmc | that is ready for git review | 08:51 |
archanaserver | ah, but after adding my changes I did "git commit -a --amend" | 08:52 |
archanaserver | and while doing git review I was facing that error | 08:52 |
vkmc | the initial time you do a commit | 08:53 |
vkmc | it should be "git commit -a" | 08:53 |
vkmc | if you are adding changes in a commit you already did | 08:54 |
vkmc | then it is "git commit -a --amend" | 08:54 |
vkmc | if not, you are amending the previous commit | 08:54 |
vkmc | which in this case | 08:54 |
vkmc | is a change merged by our ci | 08:54 |
vkmc | maybe that's the issue? | 08:54 |
vkmc | can you try adding your changes | 08:54 |
vkmc | and doing "git commit -a"? | 08:55 |
vkmc | instead of "git commit -a --amend"? | 08:55 |
archanaserver | oh yes saw that changes merge by ci, that's why I got confused | 08:55 |
archanaserver | yes sure | 08:55 |
vkmc | :) | 08:55 |
archanaserver | vkmc, my updates: | 09:13 |
archanaserver | addressed gouthamr comments in manila bug and submitted latest patch set, also left question there in comment -> https://review.opendev.org/c/openstack/manila/+/795990 | 09:13 |
archanaserver | added share type quotas and submitted my initial patch -> https://review.opendev.org/c/openstack/manila-ui/+/798807 | 09:13 |
vkmc | great! | 09:18 |
vkmc | well done! | 09:18 |
archanaserver | thanks :) can I work on any other task or any bug if you have in your mind? | 09:23 |
vkmc | archanaserver, sure, check the bug list on manila, python-manilaclient or manila-ui and see if there is something that you want to work on | 09:27 |
vkmc | archanaserver, or reviewing is also good :D | 09:27 |
archanaserver | yeah, cool then let me jump into the review part | 09:28 |
archanaserver | this is going to be challenging for me | 09:28 |
vkmc | archanaserver, you got this! | 09:29 |
archanaserver | vkmc, yup :) | 09:29 |
archanaserver | also I received my first stipend :) I want to thank you for providing positive feedback. my family is so proud of me rn :') | 09:36 |
vkmc | archanaserver, kudos! | 09:37 |
vkmc | so glad to hear that | 09:37 |
archanaserver | vkmc, yes a big thanks to you! :) | 09:38 |
vkmc | archanaserver, would you be able to meet on friday instead of tomorrow for our 1:1? | 10:01 |
vkmc | archanaserver, need to finish some paperwork for my drivers license :) | 10:02 |
archanaserver | vkmc, yes sure | 10:05 |
vkmc | archanaserver, ok, thanks | 10:07 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!