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

chore: conflict between main and develop #3868

Merged
merged 9 commits into from
Nov 11, 2024
Merged

Conversation

sanpj2292
Copy link
Contributor

What are the changes introduced in this PR?

Fix conflict between main and develop branches

What is the related Linear task?

Resolves INT-XXX

Please explain the objectives of your changes below

Put down any required details on the broader aspect of your changes. If there are any dependent changes, mandatorily mention them here

Any changes to existing capabilities/behaviour, mention the reason & what are the changes ?

N/A

Any new dependencies introduced with this change?

N/A

Any new generic utility introduced or modified. Please explain the changes.

N/A

Any technical or performance related pointers to consider with the change?

N/A

@coderabbitai review


Developer checklist

  • My code follows the style guidelines of this project

  • No breaking changes are being introduced.

  • All related docs linked with the PR?

  • All changes manually tested?

  • Any documentation changes needed with this change?

  • Is the PR limited to 10 file changes?

  • Is the PR limited to one linear task?

  • Are relevant unit and component test-cases added in new readability format?

Reviewer checklist

  • Is the type of change in the PR title appropriate as per the changes?

  • Verified that there are no credentials or confidential data exposed with the changes.

utsabc and others added 8 commits November 1, 2024 22:08
* fix: str.replace is not a function

* fix: resolving comments

* fix: update google adwords enhanced conversion config check

* chore: refactor code

* chore: fix lint errors

* chore: address comments

---------

Co-authored-by: Manish Kumar <manish.kumar@rudderstack.com>
@sanpj2292 sanpj2292 requested review from sivashanmukh and a team as code owners November 11, 2024 10:54
@devops-github-rudderstack
Copy link
Contributor

Copy link

codecov bot commented Nov 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.02%. Comparing base (bbd31a1) to head (b5baa75).
Report is 22 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3868      +/-   ##
===========================================
- Coverage    89.02%   89.02%   -0.01%     
===========================================
  Files          610      610              
  Lines        32918    32959      +41     
  Branches      7779     7789      +10     
===========================================
+ Hits         29305    29341      +36     
+ Misses        3330     3305      -25     
- Partials       283      313      +30     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

@sanpj2292 sanpj2292 merged commit 6604902 into develop Nov 11, 2024
23 of 24 checks passed
@sanpj2292 sanpj2292 deleted the chore.main-dev-conflict branch November 11, 2024 11:08
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.

6 participants