Closed fwolf closed 11 years ago
I appreciate your efforts, but I think changes will be necessary before I can merge these patches. I will comment on each.
I don't think there's a need for git commit messages to contain "add", "chg", or "fix" tags.
On balance, if you changed the commit messages, I'd merge the first four of these commits. The last one has some problems -- I'll comment there.
I've change patch and remove tags :-)
Bibliographic :date :slug supported, hope you like it.
As your wish, I've fix https://github.com/fwolf/rst2wp/commit/befa4296f62298b4424b82ae3a139bb3b56576c4 in patch https://github.com/fwolf/rst2wp/commit/6704eadddffea091be0a1fb36bba87fcc7f061b4 .
There are several patch between these 2 commit, maybe hard to rollback for me, can you merge them all ?
Or, may you suggestion me better way to rewind without lost these middle commit ? thanks.
I would prefer separate pull requests. You can create new branches using git checkout -b. Create a new branch for commits 1-4, a new branch for 6-7, a new branch for 8-9, one for 10, and one for 11. For each branch, you can do git rebase -i to choose only those patches. The other branches won't be changed when you do this. I don't think these commits depend on each other that much (but I haven't read all of them). You can do gitk --all to see where all the branches are. If you open pull requests for each group of patches, I will be able to merge just the ones I like. Plus, you will be able to discard patch 5. I like this because I don't know if I want to merge 8 or 9.
OK, I've update these commit, here is summary by origin #id:
- 1-4 not touched
- 5 is dropped
- 6-7 is not touched
- 8-9 moved to my dev branch https://github.com/fwolf/rst2wp/tree/dev, pick or discuss later
- 10-11 is not touched
I'm not using git rebase completely, instead, I export patch, rebase and skip 5+, then import or modify by these patch files.
Do you think create many branch and push to github and then send pull request is complicate ? I think can work on dev branch, and merge patch want to pull to master branch and send pull request, and 1 pull request at one time, when accepted, merge next patch(s) and send pull request again.
Is this way ok ? I'll try later.
One other thing is that the first line of git commit messages shouldn't end in a period. (This is very minor.) Make the minor change to "Better fields insert" and I'll merge this.
Wish all goes fine this time.
This is a good project, but some far for normal usable, at lease for me. So I'm trying to make it workable for me.