Recently, a commit was pushed onto the v2.4_branch that in effect merged
the master branch. I fixed this by doing a forced update of the
v2.4_branch to the last commit before the undesirable commits, but this
means that at your next pull and push all developers will have to take
extra care to avoid doing bad things.
* If you don't have any local changes you want to retain, you can
simply
git fetch
git checkout v2.4_branch
git reset --hard origin/v2.4_branch
this will make your v2.4_branch be equal to origin/v2.4_branch
* If you do have local changes you want to retain, then things are more
complicated. I'll suggest one way to do it. After committing all
your changes,
git log --oneline origin/v2.4_branch..HEAD
and note the hex id of each commit (AAAAAAA, BBBBBBB, etc). Then, do
the same as above:
git fetch
git checkout v2.4_branch
git reset --hard origin/v2.4_branch
now, for each commit (starting with the oldest one,
git cherry-pick BBBBBBB
and resolve any conflicts that may arise.
* When pushing, you should already be using 'git log' and 'gitk' and
'git push --dry-run' to make sure you understand WHAT you are
pushing, and TO WHERE. But now it's EXTRA SUPER IMPORTANT.
git push --dry-run
will say somethig like
To ssh://git.linuxcnc.org/git/emc2.git
7c72911..0b98210 v2.4_branch -> v2.4_branch
now, review all those commits, for instance in gitk:
gitk 7c72911..0b98210
If there's anything there you don't expect, fix it -- and if
you're not sure how to fix it, ask for help.
Jeff
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
