Skip to content

Conversation

@ben
Copy link
Member

@ben ben commented Mar 30, 2014

Did you have anything structural you wanted to address here?

@ben
Copy link
Member Author

ben commented Apr 1, 2014

Any advice on where to mention rerere? Since that section isn't really about the mechanics of merging, it doesn't seem to fit anywhere.

@ben ben mentioned this pull request Apr 26, 2014
@ben
Copy link
Member Author

ben commented Apr 26, 2014

I migrated the last task into its own issue. Merging this for now.

ben added a commit that referenced this pull request Apr 26, 2014
@ben ben merged commit 3c7c397 into master Apr 26, 2014
@ben ben deleted the chapter-5-updates branch April 26, 2014 16:23
@ben ben added this to the Chapter 5 - Distributed Git milestone May 3, 2014
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.

Mention request-pull

2 participants