Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pulley assumes the destination branch is always master! #41

Closed
mikesherov opened this issue Apr 15, 2012 · 2 comments
Closed

pulley assumes the destination branch is always master! #41

mikesherov opened this issue Apr 15, 2012 · 2 comments
Assignees
Labels
Milestone

Comments

@mikesherov
Copy link
Contributor

This is bad for obvious reasons. Sometimes, you're not merging into master!

@ghost ghost assigned mikesherov Apr 16, 2012
@sindresorhus
Copy link
Contributor

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

@mikesherov
Copy link
Contributor Author

@dmethvin, saw you were bit by this too. Expect both resolved by tomorrow night.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants