Re: [pytest-dev] Branches and pull request workflow

2015-04-13 Thread holger krekel
Hi Floris, I am one of the persons (the other one Ronny i guess) who do branches in the main repo. I can shift to my personal repo for this but probably shouldn't use "hpk42/pytest" for a while, right? That was the original location and people might get confused if they missed the moving to pyte

Re: [pytest-dev] Branches and pull request workflow

2015-04-13 Thread Floris Bruynooghe
Hi, On 13 April 2015 at 07:49, Anatoly Bubenkov wrote: > > to leave feature branches in people's repo only, you need to manually import diffs instead of merging, otherwise branch will be automatically transfered to main repo > or may be you mean that after merging feature branch is closed immedia

Re: [pytest-dev] Branches and pull request workflow

2015-04-12 Thread Anatoly Bubenkov
to leave feature branches in people's repo only, you need to manually import diffs instead of merging, otherwise branch will be automatically transfered to main repo or may be you mean that after merging feature branch is closed immediately, but the branch is still there, just marked as closed On

[pytest-dev] Branches and pull request workflow

2015-04-12 Thread Floris Bruynooghe
Hi all, I've just been merging a few pull requests using the new workflow and it seems to work fine: - Accept the PR into pytest-2.7 - Add changelog etc if required - Merge into default I also experimented a bit with squashing commits as discussed at fosdem but I'll leave that for later (needs a