Skip to content

Feature/hyperlink tdd #394

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

Closed
wants to merge 0 commits into from
Closed

Feature/hyperlink tdd #394

wants to merge 0 commits into from

Conversation

ryan-rushton
Copy link

PR for ease of comparison.

Would appreciate it if @scanny could have a look to see if the tests are adequate thus far.

feature: Paragraph.add_hyperlink() #74

@scanny
Copy link
Contributor

scanny commented May 6, 2017

@rushton3179 Apologies, just got down to the PR in my inbox. For some reason this PR includes a bunch of commits from DKWoods that are already merged. I think you need to rebase your feature/hyperlink-tdd branch onto the latest master. Don't create a new branch, that would break the link to this PR. (Also, don't merge, python-docx doesn't have any merges, it uses a straight-line commit history :)

@ryan-rushton
Copy link
Author

ryan-rushton commented Jul 12, 2017

Hi @scanny, this branch is a nightmare to get a clean reset at the current release of v0.8.6. I cannot seem to get the changes by DKWoods to disappear. I want to start a new branch from v0.8.6, start again with a new PR, and get your ok at each step so it is clean.

The only unfortunate thing would be the loss of git commit records. I want to use the analysis done in the feature/hyperlink branch on the main repo and if I just copy paste the file these will be lost. Rebasing is just not cleaning up the history the way I would like though.

I will await your approval before I proceed. Also sorry it has been a while, I have been busy with studies and a new job dev job. Most of the code is just sitting here though so I would like to get it in.

Cheers.

Edit: Unmerged commits prior to v0.8.6 by DKWoods, not just commits :)

@ryan-rushton
Copy link
Author

ryan-rushton commented Jul 12, 2017

I have no idea why this merged and closed, I never did this. I can only assume its when I started resetting my branch to get back to just the analysis. In any case here is the new PR I have started and will do one piece at a time to ensure a cleaner commit history, #414.

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