Skip to content

Comments

Bugfix/2132#2224

Closed
int0x81 wants to merge 2 commits intoThreeMammals:developfrom
int0x81:bugfix/2132
Closed

Bugfix/2132#2224
int0x81 wants to merge 2 commits intoThreeMammals:developfrom
int0x81:bugfix/2132

Conversation

@int0x81
Copy link
Contributor

@int0x81 int0x81 commented Nov 28, 2024

Fixed issue 2132

  • The issue was located in the UpstreamTemplatePatternCreator
  • I created Unit tests according to this issue

@int0x81 int0x81 closed this Nov 28, 2024
@raman-m
Copy link
Member

raman-m commented Dec 3, 2024

Why did you open it and close?
Seems everything was good: the build was green, no merge conflicts...

@int0x81
Copy link
Contributor Author

int0x81 commented Dec 4, 2024

@raman-m

Why did you open it and close? Seems everything was good: the build was green, no merge conflicts...

I had multiple conflicts in this PR. It seems like you did a refactoring to adapt the new namespace scheme, so I closed this PR and opened the new one #2225, which contained the exacted same changes

@raman-m
Copy link
Member

raman-m commented Dec 6, 2024

I had multiple conflicts in this PR.

To resolve a merge conflict, you can:

  • Use the GitHub online tool if the conflict is simple.
  • Use Visual Studio and the git rebase operation, based on the top commit of the develop branch.

For your information, there is no need to close the current PR with conflicts on origin.
You can merge locally and then use git push --force.

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.

2 participants