search

mrpmorris / Fluxor

Fluxor is a zero boilerplate Flux/Redux library for Microsoft .NET and Blazor.
MIT License
1.24k stars 141 forks source link

#308 #309

Closed GiannhsR closed 2 years ago

GiannhsR commented 2 years ago

Possible fix for #308 $(Configuration)=='Debug'

mrpmorris commented 2 years ago

Thanks!

You seem to have merge conflicts. Did you remember to pull first?

GiannhsR commented 2 years ago

~~I forked the main branch, created a new branch named #308_typofix. I didn't get a conflict warning while updating the readme.md. Currently, I get Is there a way for me to resolve the conflicts?~~ Seems to be corrected.

mrpmorris commented 2 years ago

It looks like you've merged 5.4 into your branch rather than basing off 5.4, this seems to be showing that your PR includes the changes of other people and I'm not sure what the result of the merge will look like.

Would you mind checking out the release/5.4 branch itself and making the change in that before submitting that branch as a PR instead? I'm sorry it's turning out to be a lot of work :)

GiannhsR commented 2 years ago

I have submitted a new PR #311