New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Desertbeachtileresort #13644

Merged
merged 2 commits into from Jul 17, 2017

Conversation

Projects
None yet
5 participants
@GSonderling
Contributor

GSonderling commented Jul 14, 2017

I reorganized the templates for desert beaches, as requested in #13587 .

The excess commits are result of unfortunate accident with notepad++.

@abcdefg30

This comment has been minimized.

Show comment
Hide comment
@abcdefg30

abcdefg30 Jul 15, 2017

Member

Can you squash the commits together, please?
(See https://help.github.com/articles/about-git-rebase/ and http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html , you can also join #openra on IRC if you need further assistance.)

Member

abcdefg30 commented Jul 15, 2017

Can you squash the commits together, please?
(See https://help.github.com/articles/about-git-rebase/ and http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html , you can also join #openra on IRC if you need further assistance.)

@GSonderling

This comment has been minimized.

Show comment
Hide comment
@GSonderling

GSonderling Jul 15, 2017

Contributor

There is a slight issue with that. You see unfortunately pushed my commits without author.

Since rebase requires identity for all commits it blocks my attempts to squash commits despite identities now being set (in both global and local scope, I double checked).

I can retract this pull request, delete the branch and instead create new branch with just one nice commit. But I can't really alter history of this one.

Contributor

GSonderling commented Jul 15, 2017

There is a slight issue with that. You see unfortunately pushed my commits without author.

Since rebase requires identity for all commits it blocks my attempts to squash commits despite identities now being set (in both global and local scope, I double checked).

I can retract this pull request, delete the branch and instead create new branch with just one nice commit. But I can't really alter history of this one.

@abcdefg30

This comment has been minimized.

Show comment
Hide comment
@abcdefg30

abcdefg30 Jul 15, 2017

Member

That sounds weird, git rebase shouldn't require any identification. What is the error message you get?

Member

abcdefg30 commented Jul 15, 2017

That sounds weird, git rebase shouldn't require any identification. What is the error message you get?

@GSonderling

This comment has been minimized.

Show comment
Hide comment
@GSonderling

GSonderling Jul 15, 2017

Contributor

fatal: empty ident name (for <mydomainID>) not allowed

I aborted the rebase and reentered all relevant info (user.name and user.email), same error.
Looked around and only new relevant information I found was , which did seem to fit my issue.

I admit that it is weird, I would expect that if that kind of thing mattered it would have shown up earlier.

Anyway seeing that I lack any other explanation I went with one provided above. Although I am open to alternatives.

Contributor

GSonderling commented Jul 15, 2017

fatal: empty ident name (for <mydomainID>) not allowed

I aborted the rebase and reentered all relevant info (user.name and user.email), same error.
Looked around and only new relevant information I found was , which did seem to fit my issue.

I admit that it is weird, I would expect that if that kind of thing mattered it would have shown up earlier.

Anyway seeing that I lack any other explanation I went with one provided above. Although I am open to alternatives.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Jul 15, 2017

Contributor

A mixed reset (leave working directory unlisted, reset index) to the last bleed commit and then recommitting your changes with a force-push thenafter sounds like the solution, but notsure how to call that in the CLT.

Contributor

GraionDilach commented Jul 15, 2017

A mixed reset (leave working directory unlisted, reset index) to the last bleed commit and then recommitting your changes with a force-push thenafter sounds like the solution, but notsure how to call that in the CLT.

@abcdefg30

This comment has been minimized.

Show comment
Hide comment
@abcdefg30

abcdefg30 Jul 15, 2017

Member

git reset --soft bleed and then (recommit and) force push. Yeah, that should work.

Member

abcdefg30 commented Jul 15, 2017

git reset --soft bleed and then (recommit and) force push. Yeah, that should work.

@GSonderling

This comment has been minimized.

Show comment
Hide comment
@GSonderling

GSonderling Jul 16, 2017

Contributor

I cleaned up the commits, thanks for the help.

Contributor

GSonderling commented Jul 16, 2017

I cleaned up the commits, thanks for the help.

@GSonderling

This comment has been minimized.

Show comment
Hide comment
@GSonderling

GSonderling Jul 16, 2017

Contributor

Deleted spaces and tabs as requested.

Contributor

GSonderling commented Jul 16, 2017

Deleted spaces and tabs as requested.

@abcdefg30

Can you please rebase and squash the commits again after those trailing spaces are removed? ^^
Looks good to me otherwise. 👍

Show outdated Hide outdated mods/ra/tilesets/desert.yaml
@GSonderling

This comment has been minimized.

Show comment
Hide comment
@GSonderling

GSonderling Jul 17, 2017

Contributor

Commits squashed.

Contributor

GSonderling commented Jul 17, 2017

Commits squashed.

Reorganised desert beach templates.
Deleted spurious tabs and spaces

As requested by @reaperrr

Removed more spaces.

One last space deleted.
@ltem

ltem approved these changes Jul 17, 2017

@abcdefg30 abcdefg30 merged commit 7a2d2cf into OpenRA:bleed Jul 17, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@abcdefg30

This comment has been minimized.

Show comment
Hide comment
@abcdefg30

abcdefg30 Jul 17, 2017

Member

Changelog

Thanks. :)

Member

abcdefg30 commented Jul 17, 2017

Changelog

Thanks. :)

@GSonderling GSonderling deleted the GSonderling:desertbeachtileresort branch Jul 18, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment