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

Split 06-collab in two different topics #116

Merged
merged 10 commits into from
May 10, 2015

Conversation

iglpdc
Copy link
Contributor

@iglpdc iglpdc commented May 8, 2015

This is a fix to #113, if we finally decide to do it.

I've chosen "Remotes In Github" as the name for the new topic. Other suggestions are welcome.

The rest is just renaming the files, and moving things around.

@iglpdc iglpdc added this to the 5.3 milestone May 8, 2015
@iglpdc iglpdc force-pushed the split-collaboration branch 5 times, most recently from b58b62a to d375c93 Compare May 9, 2015 16:22
@iglpdc
Copy link
Contributor Author

iglpdc commented May 9, 2015

This is ready to review. Can someone take a look?

@msarahan
Copy link
Contributor

msarahan commented May 9, 2015

+1, good split.

@PBarmby
Copy link
Contributor

PBarmby commented May 9, 2015

Agreed, split seems sensible, since remotes are useful even when your collaborator is yourself.

@iglpdc
Copy link
Contributor Author

iglpdc commented May 10, 2015

Thanks @PBarmby and @msarahan. I'm merging.

iglpdc added a commit that referenced this pull request May 10, 2015
Split 06-collab in two different topics
@iglpdc iglpdc merged commit 3091906 into swcarpentry:gh-pages May 10, 2015
> If you're working through this lesson on your own, you can carry on by opening
> a second terminal window, and switching to another directory (e.g. `/tmp`).
> This window will represent your partner, working on another computer. You
> won't need to give anyone access on GitHub, because both 'partners' are you.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest "both partners are you, using your Github login" to make it clearer what is meant here. Maybe also put this after talking about "giving the other person access" below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, @swaldman3, I agree in doing the change in the callout. This PR is merged already, so I'll have to make a separate one from scratch. Do you wanna do the PR yourself?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to, but it won't be today. If you're wanting to get it wrapped up, please go ahead and do it :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

El 11/05/2015, a las 10:51, Simon Waldman notifications@github.com escribió:

Happy to, but it won't be today. If you're wanting to get it wrapped up, please go ahead and do it :-)

Good, I'll leave to you then, so you get credit for it.

rgaiacs added a commit to rgaiacs/swc-git-novice that referenced this pull request Feb 13, 2017
lesson.scss: 2em left padding for lists
zkamvar pushed a commit that referenced this pull request May 8, 2023
Split 06-collab in two different topics
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.

None yet

5 participants