search

tresinformal / drakkar

The tresinformal video game called 'Drakkar'
GNU General Public License v3.0
11 stars 4 forks source link

Yang #520

Closed Yangshen0325 closed 2 years ago

Yangshen0325 commented 2 years ago

We fixed the ISSUE_509: https://github.com/tresinformal/game/issues/509

Yangshen0325 commented 2 years ago

We fixed the ISSUE_509, there's still leftovers from the previous weeks, don't pay too much attention to that.

richelbilderbeek commented 2 years ago

Hmmm, thanks for the Pull Request. I see that there are some conflicting files, so I suggest you fix those first. Tip:

git checkout develop
git pull
git checkout yang
git merge develop
git push

In that way, I get a clean Pull Request. I'd be happy to review again when you did so, because would I accept this PR I would break develop and all team members would have a failing build. That would not make me a popular team member :-)

Good luck!