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.

Sign up for GitHub

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

Jump to bottom

docs: Add docs about resolving gitflow merge conflicts #12936

Merged
merged 3 commits into from
Jul 17, 2024
Merged

docs: Add docs about resolving gitflow merge conflicts #12936

merged 3 commits into from
Jul 17, 2024

Conversation

mydea
Copy link
Member

@mydea mydea commented Jul 16, 2024

This adds docs about how to resolve gitflow merge conflicts.

@mydea mydea self-assigned this Jul 16, 2024
andreiborza
andreiborza reviewed Jul 16, 2024
View reviewed changes
docs/gitflow.md Outdated Show resolved Hide resolved
andreiborza
andreiborza reviewed Jul 16, 2024
View reviewed changes
docs/gitflow.md Outdated Show resolved Hide resolved
mydea and others added 2 commits July 16, 2024 17:03
@mydea @andreiborza
Apply suggestions from code review
2168fa5 
Co-authored-by: Andrei <168741329+andreiborza@users.noreply.github.com>
@mydea
update
a65081c
andreiborza
andreiborza approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@andreiborza andreiborza left a comment

Choose a reason for hiding this comment

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

thanks for documenting this!

Lms24
Lms24 approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

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

good to have this written down!

chargome
chargome approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@chargome chargome left a comment

Choose a reason for hiding this comment

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

Very helpful!

@mydea mydea merged commit a8bce24 into develop Jul 17, 2024
30 checks passed
@mydea mydea deleted the fn/gitflow-docs branch July 17, 2024 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lms24 Lms24 Lms24 approved these changes

@chargome chargome chargome approved these changes

@andreiborza andreiborza andreiborza approved these changes

@lforst lforst Awaiting requested review from lforst

@AbhiPrasad AbhiPrasad Awaiting requested review from AbhiPrasad

Assignees

@mydea mydea

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mydea @Lms24 @chargome @andreiborza