Custom Search

SUBSCRIBE

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

Thursday, January 1, 2015

How to Fix Patch in Merge Conflict https://review.openstack.org using checkout and rebase

1)
Clone the master branch of the project from github

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

2)
#cd puppet-heat



3)
Goto https://review.openstack.org/#/c/104795/
Click on "checkout" button and copy the link
Add " -b conflict_fix_branch" at the end of the link
#git fetch https://sajuptpm@review.openstack.org/stackforge/puppet-heat refs/changes/95/104795/4 && git checkout FETCH_HEAD -b conflict_fix_branch

4)
Confirm that you are in "conflict_fix_branch" branch

#git branch

5)
Run rebase

#git rebase -i master

6)
Fix the 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 resolved files for commit

#git add name_of_modified_file(s)

8)
Continue rebase

#git rebase --continue

9)
Push the changes

#git review



No comments:

Post a Comment