Sharing your exercises

[robmoss]

Hi everyone,

If you've been working on our testing and reproducibility exercises in your own fork of the repository, you can create a pull request. This will allow other people to review your changes, and is a great way for people to contrast and compare their results with each other. Please consider doing this if you've made some progress!

If you encounter any difficulties, please don't hesitate to reply below and we'll do our best to help 😄

[thaopletk]

Hmm you can't make a pull request for just one file 😅 Is there an easy way to make branches that keep just one new file?

[robmoss]

A pull request will include all of the differences between two branches. I see you've created a pull request that modifies a single file, so I think you've answered your own question?

[thaopletk]

I sort of answered my own question by:

1. making a duplicate branch
2. resetting hard on the master branch
3. using patch merge to merge a single file into the master branch

This could have been avoided if I used discrete feature branches properly from the beginning 🤔

[robmoss]

Oh, so you created a series of commits and wanted to make a pull request for only one of those commits? That's entirely reasonable, we don't always know ahead of time what commits or features we might want to merge.

If you want to select a subset of commits from a branch, you can use the git rebase command. We haven't covered this yet in Git is my lab book, but it's a very powerful tool. Here's one way of using it select a subset of commits for a new branch (which I've called feature/single-thing):

# Clone your repository
git clone git@github.com:thaopletk/example-testing-and-reproducibility.git
cd example-testing-and-reproducibility/
# Check out a branch that contains a number of new commits
git checkout copy_of_repo
# Create a new branch that also contains these new commits
git checkout -b feature/single-thing
# Pick the commit(s) of interest, delete the other commit lines
git rebase -i master