search

teeworlds-community / teeworlds

A community fork of teeworlds. Trying to have more active maintainers and merge prs faster.
Other
11 stars 1 forks source link

Add more sound options for chat #2277 #106

Open teeworlds-mirror opened 7 months ago

teeworlds-mirror commented 7 months ago

upstream: https://www.github.com/teeworlds/teeworlds/pull/2277

ChillerDragon commented 7 months ago

@edg-l I gave you access to the branch in case you want to solve the conflict your self. If not I might do it at some point.

edg-l commented 7 months ago

you can do it if you want, ill try if i find some time

jtbx commented 5 months ago

@ChillerDragon If you want to merge PRs with conflicts without the author's intervention, you can apply it as a patch manually:

curl -Ls https://github.com/teeworlds-community/teeworlds/pull/106.patch | git am -3

After that you can solve any conflicts locally and push to master. Very neat trick for situations like these.

Your local git identity will be set as the "committer" of the change so people can tell you applied/rebased the commit. I don't count this a problem but if you want the author and committer to stay consistent you can use git config --local in the repository to temporarily change your identity.

ChillerDragon commented 5 months ago

@jtbx a cool I did not know about this neat oneliner. But it is less of a technical problem. This branch is already a copy where I have full write access to. Its just a matter of finding the energy to actually solve the conflict. And also I would prefer the code owner to solve the conflicts. And not get their code broken by my conflict accidents.