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

chore: fix merge conflicts #61

Merged
merged 20 commits into from
Feb 4, 2025
Merged

chore: fix merge conflicts #61

merged 20 commits into from
Feb 4, 2025

Conversation

Simun17
Copy link
Collaborator

@Simun17 Simun17 commented Feb 4, 2025

Description

Fixed merge conflicts

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Refactoring (improving code structure without changing external behavior)
  • Other (please explain): merge conflicts

Checklist

  • I have performed a self-review of my code
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • My code is well documented
  • I have read and understood the contribution guidelines

Simun17 and others added 20 commits November 26, 2024 14:58
@Simun17
fix: header validation crash
80ce2c1
@Simun17
Merge pull request #35 from dataphos/develop
64adbdf 
Quickfix: header validation issue
@labramusiq
chore(main): release 1.1.1
61a6122
@Simun17
Merge pull request #36 from dataphos/release-please--branches--main
326e43b 
chore(main): release 1.1.1
@Simun17
Merge remote-tracking branch 'origin/main'
e6a25f8 
# Conflicts:
#	CHANGELOG.md
#	version.txt
@robe-rt
feat: new branching strategy (#37)
7ca590d
@robe-rt
ci: dont run any jobs on release pr (#40)
2133e3a
@robe-rt
ci: push test images tagged with git sha (#46)
c5700a6
@robe-rt
feat: schema registry docker compose (#42)
69d47e7
@robe-rt
ci: run docker build on feat, fix and release (#48)
226dab3
@Simun17
refactor: naming convention (#47)
00b415f
@Simun17
fix: added avro error reason to message header (#41) 4b191b2 @Simun17 …
2320978 
…feat: default header schema (#39) 8d51574 @Simun17 refactor: change message when empty (#44) ef8f07f @Simun17 fix: require schema format (#45)
@Simun17
fix: revert (#50)
e845a60
@Simun17
feat: new features (#51)
ac43f28 
fix: added avro error reason to message header (#41)
feat: default header schema (#39)
refactor: change message when empty (#44)
fix: require schema format (#45)
@robe-rt
ci: fixed a bug in the commit message check (#53)
7661b21
@Simun17
fix: format to lower case (#54)
2613fbd
@Simun17
fix: change message when empty (#55)
6401f66
@Simun17
chore: fixed merge comflicts
802e36b
@Simun17
Revert "chore: fix merge conflicts (#58)"
81d8d16 
This reverts commit d39ab03.
@Simun17
refactor: rename ValidateHeaders to ValidateHeader
deb47cc
@Simun17 Simun17 requested a review from a team as a code owner February 4, 2025 15:18
@Simun17 Simun17 requested a review from robe-rt February 4, 2025 15:18
@Simun17 Simun17 merged commit 18aa739 into develop Feb 4, 2025
21 checks passed
@Simun17 Simun17 deleted the chore/fix-merge-conflicts branch February 4, 2025 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@robe-rt robe-rt robe-rt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Simun17 @robe-rt @labramusiq