Skip to content

Conversation

@marcuslinke
Copy link
Contributor

Relates to #457 for 2.x branch

@KostyaSha
Copy link
Member

Use fixup, they will keep original author in commits !

@marcuslinke
Copy link
Contributor Author

Original PR was against 2.x branch. I fixed the same issue in the master branch separately as it was significantly changed meanwhile and merging/picking commits will be more painful.

@KostyaSha
Copy link
Member

git checkout -b newBranch
git rebase origin/master
git rebase -i HEAD~4 or git commit -a --amend

@marcuslinke
Copy link
Contributor Author

What should this do? 2.x and master branch differs totally meanwhile.

@marcuslinke
Copy link
Contributor Author

@KostyaSha OK. Now it got it. Sorry I'm not very familar with rebasing... Closing this and open #464 instead.

@KostyaSha
Copy link
Member

@marcuslinke no problems, just think that it good idea to keep original authors in commits. Fixup/rebase are pretty simple.

@KostyaSha KostyaSha deleted the issue-456-3.x branch August 1, 2016 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants