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

feat(conflict-resolution): add labels for branch names when resolving conflicts #7105

Merged
merged 1 commit into from
Feb 22, 2024
Merged

feat(conflict-resolution): add labels for branch names when resolving conflicts #7105

merged 1 commit into from
Feb 22, 2024

Conversation

gatzjames
Copy link
Contributor

Highlights:

  • Adds labels with the branch names for resolving conflicts in Insomnia Cloud Sync

@gatzjames gatzjames self-assigned this Feb 22, 2024
@gatzjames gatzjames requested a review from a team February 22, 2024 11:18
@gatzjames gatzjames merged commit 62a73fa into Kong:develop Feb 22, 2024
7 checks passed
@gatzjames gatzjames deleted the feat/sync-merge-modal-labels branch February 22, 2024 12:12
jackkav pushed a commit to jackkav/insomnia that referenced this pull request Mar 13, 2024
@gatzjames @jackkav
add labels for branch names when resolving conflicts (Kong#7105)
16d230c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@filfreire filfreire filfreire approved these changes

Assignees

@gatzjames gatzjames

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gatzjames @filfreire