Skip to content
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

[DOCS] Fix markdown syntax errors #982

Closed
wants to merge 1 commit into from

Conversation

cweiske
Copy link
Contributor

@cweiske cweiske commented Feb 28, 2024

Some seem to be leftovers of reStructuredText,
some tables are broken
and a typo is also fixed.

Some seem to be leftovers of reStructuredText,
some tables are broken
and a typo is also fixed.
@mschwemer mschwemer closed this Mar 20, 2024
@cweiske
Copy link
Contributor Author

cweiske commented Mar 20, 2024

Fixed with 693628d, which is attributed to @mschwemer. Why didn't you simply pick this commit here?

@mschwemer
Copy link
Collaborator

Hi Christian

thanks for your question.

I did not want to steal the attribution from you. Your original PR is unmodified in the commit history: 6dbb442. Additionally I mentioned you in the commit message.

It was a merge commit without any changes. Unfortunately I copied your commit header, instead of using a "normal" merge commit header (as in the other closed PRs from last week).

This is due to our current development workflow, the EAP program and how github handles issues and pull requests.

For our EAP we have a private repository, which is the leading one. The public repository is a mirror of the public parts. We fetch the PRs, review and test them. If they are OK, we push them first to the private repo with a Resolves: in2code-de/powermail#<pr-no>. This closes the PR also in the public repo.
If you have no access to the private one, you only see "xyz closed this". If you are part of the EAP, you will the the reference to the commit in the private repo.

Just merging it in the public repo, makes the handling of the private repo much more complicated especially, when the development for TYPO3 v13 starts.

As a first step, we will not close any PRs automatically with a push. Instead we will close it manually with a proper comment and reference to the commit of the PRs.

If you have ideas how to make the handling of two remotes easier, I am very open to discuss this, as I / we are not completely happy with the process of merging PRs.

@cweiske
Copy link
Contributor Author

cweiske commented Apr 8, 2024

Maybe the following could work for you @mschwemer:

  1. Merge patches into this public powermail repository
  2. Rebase the branches in your private repository against the public one when changes happen

This would go against the "EAP-is-leading" principle.
You could modify this and have a base branch in the private repo that is identical to the one in the public repository, and merge changes into that base branch. This could then be synced unmodified to the public repository.
You'd have to rebase your private branches against the base branch in any case.

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