Custom Search

SUBSCRIBE

SUBSCRIBE : 300 + Free Video Tutorials Programming (Python, golang, Julia), DevOps

Monday, August 25, 2014

Howto OpenStack upload new patch set to review.openstack.org

1)
Clone the project

#git clone https://github.com/stackforge/puppet-heat.git

2)
cd to cloned project

#cd puppet-heat/

3)
Goto
https://review.openstack.org/#/c/104795/
Click on "checkout" and copy the link
Add "-b bug_branch" at the end onf the link

#git fetch ssh://sajuptpm@review.openstack.org:29418/stackforge/puppet-heat refs/changes/95/104795/3 && git checkout FETCH_HEAD -b bug_branch

4)

Confirm that, you are in bug_branch

#git branch

5)
Rebase with master

#git rebase -i master

6)
Fix conflict


A conflict-marked area begins with <<<<<<< and ends with >>>>>>>.
These are also known as the conflict markers.
The two conflicting blocks themselves are divided by a =======.

<<<<<<< HEAD
     Changes in the 'master' branch.
=======
    Chnages in the working branch, Eg:conflict_fix_branch
>>>>>>> conflict_fix_branch


7)
Prepare the resoved files for commit

#git add name_of_modified_file(s)

8)
Continue rebase

#git rebase --continue

9)
This command will automatically commit all resolved files and move to the next commit.
So we don't need to commit the resolved files manually.
#git rebase --continue

10)
#Make or Apply your changes


11)
Commit the changes

#git commit -a --amend

12)
Prepare for push

#git review -s
* Enter your gerrit username: sajuptpm

13)
Push the changes

#git review

No comments:

Post a Comment