search

Trilarion / imperialism-remake

Imperialism remake
https://remake.twelvepm.de/
GNU General Public License v3.0
53 stars 19 forks source link

Features: cursor change, turn action #39

Closed amtyurin closed 3 years ago

amtyurin commented 3 years ago
Trilarion commented 3 years ago

I cherry picked the three new commits and added one on my own. See https://github.com/Trilarion/imperialism-remake/commits/master

I could not integrate this pull request as is, because you merged the master here into your master branch. That created a merge commit and resulted in the same state, but not in the same history. The history is different.

I suggest that you reset your master branch instead with something like

git remote add upstream https://github.com/Trilarion/imperialism-remake.git git reset --hard upstream/master git push

if you have not committed anything in the meantime! If you have, you would need to preserve the commits in between!

amtyurin commented 3 years ago

Just did that, I needed to add git fetch upstream and do force push for my branch.

On Sep 14, 2020, at 4:17 AM, Trilarion notifications@github.com wrote:

I cherry picked the three new commits and added one on my own. See https://github.com/Trilarion/imperialism-remake/commits/master https://github.com/Trilarion/imperialism-remake/commits/master I could not integrate this pull request as is, because you merged the master here into your master branch. That created a merge commit and resulted in the same state, but not in the same history. The history is different.

I suggest that you reset your master branch instead with something like

git remote add upstream https://github.com/Trilarion/imperialism-remake.git https://github.com/Trilarion/imperialism-remake.git git reset --hard upstream/master git push

if you have not committed anything in the meantime! If you have, you would need to preserve the commits in between!

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Trilarion/imperialism-remake/pull/39#issuecomment-691987803, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAXCT4GRH6CVA3NFQB5CL7LSFX3VTANCNFSM4RKPEM4Q.

Trilarion commented 3 years ago

Right. Now we are completely equal and all future Pull requests should go smoothly.

Trilarion commented 3 years ago

I described the current state of the network communication in the forum. See https://remake.twelvepm.de/forum/viewtopic.php?f=10&t=1551

amtyurin commented 3 years ago

Ok, thanks! I’ve added some question there

On Sep 15, 2020, at 11:31 AM, Trilarion notifications@github.com wrote:

I described the current state of the network communication in the forum. See https://remake.twelvepm.de/forum/viewtopic.php?f=10&t=1551 https://remake.twelvepm.de/forum/viewtopic.php?f=10&t=1551 — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Trilarion/imperialism-remake/pull/39#issuecomment-692896333, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAXCT4GBNM5WE2YTYX33DG3SF6XI7ANCNFSM4RKPEM4Q.