From: John Reese <jreese@le...> - 2009-01-15 16:13:11
As noted in my "Branch Proposals" message, I have reworked the master
branches in the repository.
Developers and anyone tracking the repository may need to take the
following steps to properly track the changes the master branch.
NOTE: THIS WILL DESTROY ANY LOCAL COMMITS TO THE MASTER BRANCH!
git checkout master
git reset --hard origin/master
Then for any local branches following the old master branch (now named
'rpxnow'), you will need to do the following to bring them onto the new
master branch, replacing 'feature' with the appropriate local branch name:
git rebase --onto master rpxnow feature
This should work perfectly fine, but as a last resort, you can always
create a new branch from master, and then `git cherry-pick <ref>` for
all the unique commits on your old feature branch.
If you have any questions/troubles, let me know.
On Thu, Jan 15, 2009 at 5:13 PM, John Reese <jreese@...> wrote:
> NOTE: THIS WILL DESTROY ANY LOCAL COMMITS TO THE MASTER BRANCH!
> git fetch
> git checkout master
> git reset --hard origin/master
> Then for any local branches following the old master branch (now named
> 'rpxnow'), you will need to do the following to bring them onto the new
> master branch, replacing 'feature' with the appropriate local branch name:
> git rebase --onto master rpxnow feature
Ok, what about the branches that got pushed on other places like
For instance, I have a remote "dw" and a local branch newlayout
tracking dw/newlayout from
How should I proceed with it?