Ask Your Question

Revision history [back]

click to hide/show revision 1
initial version

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i check y repo using git status ..i see soo may files have been changed(which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview ??

so these are the steps i followed njain@njain3:/opt/stack/python-novaclient$ git fetch origin njain@njain3:/opt/stack/python-novaclient$ git reset --hard origin/master

$ njain@njain3:/opt/stack/python-novaclient$ git status

Not currently on any branch.

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git checkout -- <file>..." to discard changes in working directory)

#

modified: novaclient/v1_1/shell.py

modified: novaclient/v3/shell.py

#

Untracked files:

(use "git add <file>..." to include in what will be committed)

#

y

y.pub

njain@njain3:./run_test.sh Ran 795 tests in 17.484s (-0.339s) PASSED (id=2) Running flake8 ... njain@njain3:/opt/stack/python-novaclient$ njain@njain3:/opt/stack/python-novaclient$ rm -fr /opt/stack/python-novaclient/.git/rebase-merge njain@njain3: git commit -a [detached HEAD fafc1ff] adding checks for corner cases of aggregate-set-metadata Committer: Neetu njain@njain3.localdomain Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

2 files changed, 21 insertions(+), 1 deletion njain@njain3:/opt/stack/python-novaclient$ git review

Errors running git rebase -i remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". Could not apply 7304ed8... Initial commit from fork njain@njain3:/opt/stack/python-novaclient$ git staus

new file: tests/test_images.py

new file: tests/test_ipgroups.py

new file: tests/test_servers.py

new file: tests/test_shell.py

new file: tests/testfile.txt

new file: tests/utils.py

#

Unmerged paths:

(use "git reset HEAD <file>..." to unstage)

(use "git add/rm <file>..." as appropriate to mark resolution)

#

both added: LICENSE

both added: MANIFEST.in

both added: README.rst

both added: setup.cfg

both added: setup.py

both added: tox.ini

#

Untracked files:

(use "git add <file>..." to include in what will be committed)

#

y

y.pub

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i check y repo using git status ..i see soo may files have been changed(which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview ??

so these are the steps i followed njain@njain3:/opt/stack/python-novaclient$ git fetch origin njain@njain3:/opt/stack/python-novaclient$ git reset --hard origin/master

$ njain@njain3:/opt/stack/python-novaclient$ git status

Not currently on any branch.

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git checkout -- <file>..." to discard changes in working directory)

#

 modified:   novaclient/v1_1/shell.py

novaclient/v1_1/shell.py modified: novaclient/v3/shell.py

#

Untracked files:

(use "git add <file>..." to include in what will be committed)

#

y

y.pub

novaclient/v3/shell.py

njain@njain3:./run_test.sh Ran 795 tests in 17.484s (-0.339s) PASSED (id=2) Running flake8 ... njain@njain3:/opt/stack/python-novaclient$ njain@njain3:/opt/stack/python-novaclient$ rm -fr /opt/stack/python-novaclient/.git/rebase-merge njain@njain3: git commit -a [detached HEAD fafc1ff] adding checks for corner cases of aggregate-set-metadata Committer: Neetu njain@njain3.localdomain Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

2 files changed, 21 insertions(+), 1 deletion njain@njain3:/opt/stack/python-novaclient$ git review

Errors running git rebase -i remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". --abort". Could not apply 7304ed8... Initial commit from fork njain@njain3:/opt/stack/python-novaclient$ git staus

new file: tests/test_images.py

new file: tests/test_ipgroups.py

new file: tests/test_servers.py

new file: tests/test_shell.py

new file: tests/testfile.txt

new file: tests/utils.py

#

Unmerged paths:

(use "git reset HEAD <file>..." to unstage)

(use "git add/rm <file>..." as appropriate to mark resolution)

#

both added: LICENSE

both added: MANIFEST.in

both added: README.rst

both added: setup.cfg

both added: setup.py

both added: tox.ini

#

Untracked files:

(use "git add <file>..." to include in what will be committed)

#

y

y.pub

and i see soo many files changed!!! which i did not modify

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i check y repo using git status ..i see soo may files have been changed(which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview ??

so these are the steps i followed njain@njain3:/opt/stack/python-novaclient$ followed git fetch origin njain@njain3:/opt/stack/python-novaclient$ git reset --hard origin/master

$ njain@njain3:/opt/stack/python-novaclient$ git status

   modified:   novaclient/v1_1/shell.py
   modified:   novaclient/v3/shell.py

njain@njain3:./run_test.sh Ran 795 tests in 17.484s (-0.339s) PASSED (id=2) Running flake8 ... njain@njain3:/opt/stack/python-novaclient$ njain@njain3:/opt/stack/python-novaclient$ rm -fr /opt/stack/python-novaclient/.git/rebase-merge njain@njain3: git commit -a [detached HEAD fafc1ff] adding checks for corner cases of aggregate-set-metadata Committer: Neetu njain@njain3.localdomain Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You origin/master git status ( i can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

see my 2 files changed, 21 insertions(+), 1 deletion njain@njain3:/opt/stack/python-novaclient$ changed) ./run_test.sh** (test passes) git commit -a git review

and this is what i get :-

Errors running git rebase -i remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". Could not apply 7304ed8... Initial commit from fork njain@njain3:/opt/stack/python-novaclient$ git staus

and if i do "git status" and i see soo many files changed!!! which i did not modify

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i check y repo using git status ..i see soo may files have been changed(which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview ??

so these are the steps i followed followed

git fetch origin origin

git reset --hard origin/master origin/master

git status ( i can see my 2 files changed) changed)

./run_test.sh** (test passes) git commit -a passes)

git commit -a

git review

and this is what i get :-

Errors running git rebase -i remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". Could not apply 7304ed8... Initial commit from fork

and if i do "git status" and i see soo many files changed!!! which i did not modify

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i check y repo using git status ..i see soo may files have been changed(which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview ??

so these are the steps i followed

git fetch origin

git reset --hard origin/master

git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a

git review

and this is what i get :-

Errors running git rebase -i remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". --abort". Could not apply 7304ed8... Initial commit from fork

and if i do "git status" and i see soo many files changed!!! which i did not modify

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review) review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when i I check y the repo using git status ..i see soo may so many files have been changed(which changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for reeview review ??

so these are the steps i followed

git fetch origin

origin git reset --hard origin/master

origin/master git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a

git review

passes) git commit -a git review

and this is what i get :-

Errors

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork

fork***

and if i do "git status" and i see soo many files changed!!! which i did not modify modify.

please help can nto submit my first review

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git fetch origin
 git reset --hard origin/master
 git status ( i can see my 2 files changed)

changed)

./run_test.sh** (test passes)

git commit -a
git review

and this is what i get :-

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork***

and if i do "git status" i see soo many files changed!!! which i did not modify.

please help can nto How do I rebase my changes to submit my first reviewreview?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git fetch origin
git reset --hard origin/master
git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a
git review

and this is what i get :-

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork***

and if i do "git status" i see soo many files changed!!! which i did not modify.

How do I rebase my changes to submit my first review?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git fetch origin
git reset --hard origin/master
git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a
git review

and this is what i get :-

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork***

and if i do "git status" i see soo many files changed!!! which i did not modify.

I did create a new branch before committing and i am committing from my new branch. New changes keep popping up (i followed steps suggested by @chen in comments, too )

# njain@njain3:/opt/stack/python-novaclient$ git branch
* bug129257
  master
# njain@njain3:/opt/stack/python-novaclient$ git commit -a

adding cornercase checks for set metadata
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: Neetu <njain@njain3.localdomain>

 On branch bug129257
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

       modified:   novaclient/v1_1/shell.py
       modified:   novaclient/v3/shell.py

~
~

 2 files changed, 21 insertions(+), 1 deletion(-)
#  njain@njain3:/opt/stack/python-novaclient$ git review

How do I rebase my changes to submit my first review?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git fetch origin
git reset --hard origin/master
git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a
git review

and this is what i get :-

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork***

and if i do "git status" i see soo many files changed!!! which i did not modify.

I did create a new branch before committing and i am committing from my new branch. New changes keep popping up (i followed steps suggested by @chen in comments, too )

# njain@njain3:/opt/stack/python-novaclient$ git branch
* bug129257
  master
# njain@njain3:/opt/stack/python-novaclient$ git commit -a

adding cornercase checks for set metadata
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: Neetu <njain@njain3.localdomain>

 On branch bug129257
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

       modified:   novaclient/v1_1/shell.py
       modified:   novaclient/v3/shell.py

~
~

 2 files changed, 21 insertions(+), 1 deletion(-)
#  njain@njain3:/opt/stack/python-novaclient$ git review


njain@njain3:/opt/stack/python-novaclient$ git review
Errors running git rebase -i remotes/gerrit/master
LICENSE: needs merge
README.rst: needs merge
docs/conf.py: needs merge
docs/releases.rst: needs merge
novaclient/__init__.py: needs merge
setup.py: needs merge
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them.

How do I rebase my changes to submit my first review?changeset to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git fetch origin
git reset --hard origin/master
git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a
git review

and this is what i get :-

***Errors running git rebase -i remotes/gerrit/master
error: could not apply 7304ed8... Initial commit from fork
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Could not apply 7304ed8... Initial commit from fork***

and if i do "git status" i see soo many files changed!!! which i did not modify.

I did create a new branch before committing and i am committing from my new branch. New changes keep popping up (i followed steps suggested by @chen in comments, too )

# njain@njain3:/opt/stack/python-novaclient$ git branch
* bug129257
  master
# njain@njain3:/opt/stack/python-novaclient$ git commit -a

adding cornercase checks for set metadata
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: Neetu <njain@njain3.localdomain>

 On branch bug129257
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

       modified:   novaclient/v1_1/shell.py
       modified:   novaclient/v3/shell.py

~
~

 2 files changed, 21 insertions(+), 1 deletion(-)
#  njain@njain3:/opt/stack/python-novaclient$ git review


njain@njain3:/opt/stack/python-novaclient$ git review
Errors running git rebase -i remotes/gerrit/master
LICENSE: needs merge
README.rst: needs merge
docs/conf.py: needs merge
docs/releases.rst: needs merge
novaclient/__init__.py: needs merge
setup.py: needs merge
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them.

How do I rebase my changes to submit my first changeset to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git branch

*master

git remote update & git pull ( i pull the latest code)

git status ( i verify there are no changes)

git checkout -b bug1292572 ( i checkout a new branch )

git rebase master

git status

git fetch origin
git reset --hard origin/master
git status ( i can see my 2 files changed)

./run_test.sh** (test passes)

git commit -a
git review
  modified:   novaclient/v1_1/shell.py
  modified:   novaclient/v3/shell.py

and this is what i get :-

***Errors git commit -a 

git review

*Errors running git rebase -i remotes/gerrit/master remotes/gerrit/master

error: could not apply 7304ed8... Initial commit from fork fork

When you have resolved this problem run "git rebase --continue". --continue".

If you would prefer to skip this patch, instead run "git rebase --skip". --skip".

To check out the original branch and stop rebasing run "git rebase --abort". --abort".

Could not apply 7304ed8... Initial commit from fork*** fork*

and when i do git status after this stage i see a lot of changes i did not make.

My branch is up to date then what is the reason these changes pop up ?

njain@njain3:/opt/stack/python-novaclient$ git remote -v

gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (fetch)
gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (push)
origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
origin  git://git.openstack.org/openstack/python-novaclient.git (push)

and if i do "git status" i see soo many files changed!!! which i did not modify.

I did create a new branch before committing and i am committing from my new branch. New changes keep popping up (i followed steps suggested by @chen in comments, too )

# njain@njain3:/opt/stack/python-novaclient$ git branch
* bug129257
  master
# njain@njain3:/opt/stack/python-novaclient$ git commit -a

adding cornercase checks for set metadata
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: Neetu <njain@njain3.localdomain>

 On branch bug129257
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

       modified:   novaclient/v1_1/shell.py
       modified:   novaclient/v3/shell.py

~
~

 2 files changed, 21 insertions(+), 1 deletion(-)
#  njain@njain3:/opt/stack/python-novaclient$ git review


njain@njain3:/opt/stack/python-novaclient$ git review
Errors running git rebase -i remotes/gerrit/master
LICENSE: needs merge
README.rst: needs merge
docs/conf.py: needs merge
docs/releases.rst: needs merge
novaclient/__init__.py: needs merge
setup.py: needs merge
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them.

How do I rebase my changes to submit my first changeset to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git branch

*master

git remote update & git pull ( i pull the latest code)

git status ( i verify there are no changes)

git checkout -b bug1292572 ( i checkout a new branch )

git rebase master

git status

  modified:   novaclient/v1_1/shell.py
  modified:   novaclient/v3/shell.py

git commit -a

git review

*Errors

 ***Errors running git rebase -i remotes/gerrit/master

remotes/gerrit/master error: could not apply 7304ed8... Initial commit from fork

fork When you have resolved this problem run "git rebase --continue".

--continue". If you would prefer to skip this patch, instead run "git rebase --skip".

--skip". To check out the original branch and stop rebasing run "git rebase --abort".

--abort". Could not apply 7304ed8... Initial commit from fork*

fork***

and when i do git status after this stage i see a lot of changes i did not make.

My branch is up to date then what is the reason these changes pop up ?

njain@njain3:/opt/stack/python-novaclient$ git remote -v

gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (fetch)
gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (push)
origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
origin  git://git.openstack.org/openstack/python-novaclient.git (push)

How do I rebase my changes to submit my first changeset to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git branch

*master

*master

git remote update & git pull ( i pull the latest code)

git status ( i verify there are no changes)

git checkout -b bug1292572 ( i checkout a new branch )

git rebase master

git status

  modified:   novaclient/v1_1/shell.py
  modified:   novaclient/v3/shell.py

git commit -a

git review

 ***Errors running git rebase -i remotes/gerrit/master

 error: could not apply 7304ed8... Initial commit from fork

 When you have resolved this problem run "git rebase --continue".

 If you would prefer to skip this patch, instead run "git rebase --skip".

 To check out the original branch and stop rebasing run "git rebase --abort".

 Could not apply 7304ed8... Initial commit from fork***

and when i do git status after this stage i see a lot of changes i did not make.

My branch is up to date then what is the reason these changes pop up ?

njain@njain3:/opt/stack/python-novaclient$ git remote -v

gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (fetch)
gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (push)
origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
origin  git://git.openstack.org/openstack/python-novaclient.git (push)

How do I rebase my changes to submit my first changeset changes to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git branch

*master

git remote update & git pull ( i pull the latest code)

git status ( i verify there are no changes)

git checkout -b bug1292572 ( i checkout a new branch )

git rebase master

git status

  modified:   novaclient/v1_1/shell.py
  modified:   novaclient/v3/shell.py

git commit -a

git review

 ***Errors running git rebase -i remotes/gerrit/master

 error: could not apply 7304ed8... Initial commit from fork

 When you have resolved this problem run "git rebase --continue".

 If you would prefer to skip this patch, instead run "git rebase --skip".

 To check out the original branch and stop rebasing run "git rebase --abort".

 Could not apply 7304ed8... Initial commit from fork***

and when i do git status after this stage i see a lot of changes i did not make.

My branch is up to date then what is the reason these changes pop up ?

njain@njain3:/opt/stack/python-novaclient$ git remote -v

gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (fetch)
gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (push)
origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
origin  git://git.openstack.org/openstack/python-novaclient.git (push)

How do I rebase my changes to submit my first changes to OpenStack?

when i try to submit my tried and tested change ( after running tests i do a git commit and then git review). I see that "git review" take forever .. adn then it returns with some failure stating "i need to fix these conflicts" and when I check the repo using git status ..i see so many files have been changed (which i did not modify) ...can somebody please help me understand what i need to do to submit my changes for review ??

so these are the steps i followed

git branch

*master

git branch *master git remote update & git pull ( i pull the latest code)

git status ( i verify there are no changes)

git checkout -b bug1292572 ( i checkout a new branch )

git rebase master

) git rebase master git status

   modified:   novaclient/v1_1/shell.py
  modified:   novaclient/v3/shell.py

git commit -a

git review

  ***Errors running git rebase -i remotes/gerrit/master
   error: could not apply 7304ed8... Initial commit from fork
   When you have resolved this problem run "git rebase --continue".
   If you would prefer to skip this patch, instead run "git rebase --skip".
   To check out the original branch and stop rebasing run "git rebase --abort".
   Could not apply 7304ed8... Initial commit from fork***

and when i do git status after this stage i see a lot of changes i did not make.

My branch is up to date then what is the reason these changes pop up ?

njain@njain3:/opt/stack/python-novaclient$ git remote -v

njain@njain3:/opt/stack/python-novaclient$ git remote -v

    gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (fetch)
 gerrit  ssh://neetu@review.openstack.org:29418/openstack/nova.git (push)
 origin  git://git.openstack.org/openstack/python-novaclient.git (fetch)
 origin  git://git.openstack.org/openstack/python-novaclient.git (push)