Closed mikesherov closed 12 years ago
Ouch, I had to merge into an alternative branch today. It was painful doing it by hand...
Had to do something like this:
git checkout -b bug123
git pull http://repourl.git branch
git checkout labs
git merge --no-commit --squash bug123
git log | grep "Author" | head -1 # get the author
git commit -a --author="Author" --message="Closes #1: Title"
git push origin labs
@dmethvin, saw you were bit by this too. Expect both resolved by tomorrow night.
This is bad for obvious reasons. Sometimes, you're not merging into master!