| naymu | gouthamr Hi I have made some changes and add that into the git now I need to pushed that into the upstream repo. I have done testing and linting in my local machine.How can I pushed the changes? | 16:06 |
|---|---|---|
| gouthamr | naymu: https://etherpad.opendev.org/p/r.f30f6f0995fc5b11b6b1a09186798725 | 16:23 |
| gouthamr | naymu: we use gerrit for reviewing code submissions, so you need an account on https://review.opendev.org (sign up, create a username, sign the CLA under “Agreements” and upload your SSH key) | 16:24 |
| gouthamr | naymu: once you have this done, you can install the “git-review” tool (pip install git-review) and run “git review” from the repository folder | 16:25 |
| naymu | Thanks I will complete those task shortly :) | 16:40 |
| naymu_ | gouthamr: After making the `git review` command request in the terminal and giving the passkey, Getting the following error: Errors running git rebase -p -i remotes/gerrit/master | 17:31 |
| naymu_ | error: cannot rebase: You have unstaged changes. | 17:31 |
| naymu_ | error: Please commit or stash them. | 17:31 |
| naymu_ | It is likely that your change has a merge conflict. You may resolve it | 17:31 |
| naymu_ | in the working tree now as described above and then run 'git review' | 17:31 |
| naymu_ | again, or if you do not want to resolve it yet (note that the change | 17:31 |
| naymu_ | can not merge until the conflict is resolved) you may run 'git rebase | 17:31 |
| naymu_ | --abort' then 'git review -R' to upload the change without rebasing. | 17:31 |
| gouthamr | naymu_: the error message has the cause, and the solution: error: cannot rebase: You have unstaged changes. error: Please commit or stash them. | 17:32 |
| naymu_ | gouthamr: Why its giving me I have some unstage changes although I have changes one file only and I made the commit before | 17:32 |
| gouthamr | naymu_: use "git status" to see what is unstaged | 17:33 |
| naymu_ | Already tried that there are all the file are being moddified | 17:33 |
| naymu_ | If is there any way I can send screenshot regarding that.... | 17:34 |
| gouthamr | > Already tried that there are all the file are being moddified | 17:35 |
| gouthamr | ^ that's strange indeed | 17:35 |
| naymu_ | Yeah it is :( | 17:36 |
| gouthamr | naymu_: you can copy paste your error here: https://paste.opendev.org | 17:36 |
| naymu_ | gouthamr: https://paste.opendev.org/show/bdFSjEXwpCahM4GVwdtE/ | 17:39 |
| gouthamr | naymu_: hmmm, that looks pretty strange. Are you using a windows machine? | 17:41 |
| naymu_ | Yeah I am using a windows machine | 17:43 |
| naymu_ | But I have a virtual ubuntu on my machine | 17:43 |
| gouthamr | naymu_: can you paste the o/p of "git diff" through https://paste.opendev.org/ as well? | 17:44 |
| naymu_ | Let me do it | 17:44 |
| naymu_ | gouthamr: https://paste.opendev.org/show/b2uBnePUBQOiU2WEjr9u/ | 17:44 |
| gouthamr | naymu_: not for a single file, the whole repo | 17:45 |
| gouthamr | naymu_: i think your setup is messing up the clrf settings | 17:46 |
| naymu_ | gouthamr: I have made the `git diff` command in the terminal and getting this: diff --git a/.coveragerc b/.coveragerc | 17:49 |
| naymu_ | index 273a355db..669e9d03a 100644 | 17:49 |
| naymu_ | --- a/.coveragerc | 17:49 |
| naymu_ | +++ b/.coveragerc | 17:49 |
| naymu_ | @@ -1,8 +1,8 @@ | 17:49 |
| naymu_ | -[run] | 17:49 |
| naymu_ | -branch = True | 17:49 |
| naymu_ | -source = manila | 17:49 |
| naymu_ | -omit = manila/test* | 17:49 |
| naymu_ | -concurrency = eventlet | 17:49 |
| naymu_ | - | 17:49 |
| naymu_ | -[report] | 17:49 |
| gouthamr | naymu_: please use https://paste.opendev.org/; don't paste directly on irc.. you might trigger the spam filters | 17:49 |
| naymu_ | Oh sorry | 17:49 |
| naymu_ | For the clrf setting should I make a command "git config --global core.autocrlf input"? | 17:50 |
| naymu_ | Please check this out: https://paste.opendev.org/show/bQKk24lc3EX167LN6HVY/ | 17:52 |
| gouthamr | depends if you're committing from windows, or ubuntu.. if windows set "git config --global core.autocrlf true" | 17:56 |
| ccokeke[m] | Also naymu_: You need to run the following command if this is your first patch.... (full message at <https://matrix.org/_matrix/media/v3/download/matrix.org/ULyCCaJYpwMmRbMwYXEnzZIB>) | 18:02 |
| ccokeke[m] | Which branch are you at? Hope you created local branch. Confirm with `git branch` | 18:03 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!