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: decision record about renaming git branches #177

Merged
merged 3 commits into from
Apr 5, 2023
Merged

docs: decision record about renaming git branches #177

merged 3 commits into from
Apr 5, 2023

Conversation

paullatzelsperger
Copy link
Contributor

WHAT

This PR adds a decision record about why and how we should rename our Git branches.

Copy link
Contributor

@florianrusch-zf florianrusch-zf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also document e.g. in the CONTRIBUTING.md file, that we are following an modified git flow. But I will also add this to the issue.

@florianrusch-zf
Copy link
Contributor

florianrusch-zf commented Apr 4, 2023

We should also document e.g. in the CONTRIBUTING.md file, that we are following an modified git flow. But I will also add this to the issue.

never mind! We have documented it in the DR so that should be enough or?

paullatzelsperger and others added 2 commits April 4, 2023 09:51
…/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>
…/README.md

Co-authored-by: Florian Rusch (ZF Friedrichshafen AG) <[email protected]>
@paullatzelsperger
Copy link
Contributor Author

paullatzelsperger commented Apr 4, 2023

We should also document e.g. in the CONTRIBUTING.md file, that we are following an modified git flow. But I will also add this to the issue.

never mind! We have documented it in the DR so that should be enough or?

Yes it should, but I think it is not relevant for contributions all that much. People will have forks, and create PRs with 'main' as base by default. So unless they explicitly target a different branch, it should all be done automatically

@paullatzelsperger paullatzelsperger merged commit 16d1a66 into eclipse-tractusx:develop Apr 5, 2023
@paullatzelsperger paullatzelsperger deleted the docs/decision_record_branch_names branch April 11, 2023 05:35
paullatzelsperger added a commit to paullatzelsperger/tractusx-edc that referenced this pull request May 4, 2023
paullatzelsperger added a commit that referenced this pull request May 4, 2023
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.

3 participants