I am not very much clear about git rebase workflow, I try my self to rebase two different branches as mention below.
But I am not able to update my branch to where master is pointing after rebase completed.
Below are the steps which I performed
git clone https://github.com/myadmin/testrepo.git git checkout -b hotfix git push origin hotfix modify file "todo.txt" on hotfix branch. git add todo.txt git commit -m "todo updates" git push remote master
Now I checkout "master" branch
git checkout master modify file "todo.txt" on master branch. I modify same line which I modify in my "hotfix" branch so I can generate conflict. git add todo.txt git commit -m "todo updates" git push remote hotfix
upto now I just forwared both branch "master" and "hotfix" with 1 commit, so I can perform rebase.
Now I rebase with following commands
git checkout hotfix git rebase master
so I got the conflict so, I fix all manually with opening file in text editor and again add and commit that file as below.
git add todo.txt git commit -m "resolve conflict" git rebase --continue
till now my rebase is completed, now I wants to move my "master" pointer so I run below command
git checkout master git merge hotfix
Now I got my "hotfix" changes to "master" perfectely.
MY qesestion is start from here.......
How to point my "hotfix" branch to where "master" is currently poinging after rebase operation ?