stop creating PRs for every commit?

[umlaeute]

don't know where to put this, but... now that we have #175 in place, I see that the history of the documentation branch becomes like this:

i figure, you don't ever look at the commit history, but I do regularly and it is a real eye sore.

so: can we avoid this?

• @porres could just directly push to the documentation branch in the pure-data repository (and completely drop the porres/Documentation branch). e.g. assuming that the puredata remote points to https://github.com/pure-data/pure-data/

  git push -u puredata documentation

  • you could also push to both branches, if you prefer this (but as it is a more complicated setup, it might as well go more wrong)

    git push origin Documentation
    git push puredata documentation

• if you insist on merging via the webinterface, you could

  • accumulate more commits before merging
  • always use Rebase and merge for merging to keep the history linear

when setting up the branch rules for the documentation branch I was tempted to add Force a linear history to the rules, but i thought that that would create more problems when a couple of people work together (and it seems overly pedantic anyhow). rethinking, it's probably not a bad idea anyhow, since any trivial merge can be easily turned into a rebase, and any non-trivial merge won't work for Pd-patches anyhow.

---

for reference: here's how I would have imagined the history to look like

[umlaeute]

i just noted that i got very derailed from the subject. there are actually two different issues:

• creating a spiderweb in the commit history for no reason
• generating notification noise when creating zillions of PRs

the title speaks of the 2nd, but my description deals with the first.

i'm really concerned with both.

as i've explained the spiderweb already, here's my hitch on the PRs:

when you create a PR all people subscribed to the repository will get notified. when the PR is closed, they will also get notified (I think luckily github will not create two notifications for the "open" and "close" events if they are chronologically close). this makes my GitHub inbox full with useless stuff (as @porres can do all the things by themselves). an inbox full of useless stuff buries important messages, which i would like to prevent.

github allows me to unsubscribe from the notifications of a repository, but i do not want to do this for the pure-data repo: I do care about it, and I want to be notified of things in this repository that are actually important.

i do not think that i can configure github to not send me any notifications from a single person (and i'm not sure whether i would want all messages from @porres to be blocked; i'm just annoyed by those useless PRs). i'm pretty sure that i cannot configure github to not send me "useless notifications".

[umlaeute]

with no dissents, i've now applied the rule to force "linear history", for solving the "spiderweb history".

please let me know if this creates any problems.

the "useless PRs" are not tackled at all.

[porres]

@porres could just directly push to the documentation branch in the pure-data repository (and completely drop the porres/Documentation branch).

sure, I'l ltry next time

if you insist on merging via the webinterface, you could

accumulate more commits before merging always use Rebase and merge for merging to keep the history linear

I am quite used to using 'github desktop' and the web interface, I can also try to "Rebase and merge"

with no dissents, i've now applied the rule to force "linear history", for solving the "spiderweb history".

please let me know if this creates any problems.

the "useless PRs" are not tackled at all.

hmmm, so, I just keep doing what I was doing then? :)

[umlaeute]

hmmm, so, I just keep doing what I was doing then? :)

you shouldn't have to care about the "Rebase and Merge" anymore, as (I think) the only option fr you to merge is now exactly that.

but since this issue is really about "stop creating PRs for every commit", you still should push directly to the documentation branch, and not create an extra PR (for merging your changes into the documentation branch) at all. (we will need to create a new Documentation fixes PR once documentation got merged, just like with the stable development branch; but that is a single PR until miller merges it)

[porres]

I just tried another commit and it seems I did it again, right?

I had the impression things would just magically work now

[umlaeute]

Depends on what you mean by "it" (and I'm currently afk so I don't want to do a full analysis of the situation).

Anyhow, you can push whatever you like to your own branches and nobody cares how you call these branches. It is only important that whatever you want to go into the documentation branch of the pure-data repository is pushed to the documentation branch of the pure-data repository (and you can and should push directly without doing any PRs)

[porres]

Depends on what you mean by "it"

I think I created a new PRs for a new commit (and also every future one if I keep doing the same), didn't I?

[porres]

didn't I?

Just did another pull but paying attention now, seems I'm, looks like I'm doing more PRs for sure...

It is only important that whatever you want to go into the documentation branch of the pure-data repository is pushed to the documentation branch of the pure-data repository (and you can and should push directly without doing any PRs)

I do have a local 'documentation' branch in my fork and I do target the documentation branch of the pure-data repository...

and it only shows me an option to create a pull request

(and you can and should push directly without doing any PRs)

i wouldn't know how, I am of course using the github desktop app and the web resources, maybe you mean I can do it via some command line in the terminal. After I click the PR button I go to the web and it only shows me how to create a PR

Then I can "squash and merge"

If this is not good, let me know please

[Lucarda]

someone must correct me if i got it wrong but basically you have to:

• clone https://github.com/pure-data/pure-data.git i mean the official one and not your fork.

• checkout the documentation branch.

  • here you can fetch, pull or push

  • if anyone (like me) sends you a PR on the web just merge it. Then fetch and pull to update your "local branch".

  • if you edit files just commit and push. You have write access to documentation (like when you are committing to your ELSE repo).

[porres]

ok, now that I am part of pure-data, I was able to clone directly from pd repo and not my fork

I did a small test change in https://github.com/pure-data/pure-data/pull/2147/commits/570be229473828253961a77db5b57c5d560cc7c9 and pushed it, no PR, couldn't be easier, thanks!

[porres]

I'm just doing what I usually do in the github app like I do with ELSE, no brainer... sorry for not figuring out sooner and thanks again