Skip to content
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

Jump to bottom

freeorion 0.4.6 -> 0.4.7 #32357

Closed
wants to merge 1 commit into from
Closed

freeorion 0.4.6 -> 0.4.7 #32357

wants to merge 1 commit into from

Conversation

tex
Copy link
Contributor

@tex tex commented Dec 5, 2017

Motivation for this change

Update.

Things done
  • [ x] Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • [x ] NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • [ x] Fits CONTRIBUTING.md.

@tex tex changed the title 0.4.6 -> 0.4.7 freeorion 0.4.6 -> 0.4.7 Dec 5, 2017
@bjornfor
Copy link
Contributor

bjornfor commented Dec 5, 2017

Don't forget to update the commit message too (add "freeorion:" prefix).

@tex
Copy link
Contributor Author

tex commented Dec 5, 2017

How? Should I force push to overwrite this commit?

@bjornfor
Copy link
Contributor

bjornfor commented Dec 5, 2017

Yes. Amend the commit and force push.

@tex tex closed this Dec 6, 2017
@tex tex deleted the freeorion branch December 6, 2017 20:35
@bjornfor
Copy link
Contributor

bjornfor commented Dec 6, 2017

? (You can "git commit --amend && git push --force" and the github PR will be updated.)

@tex
Copy link
Contributor Author

tex commented Dec 6, 2017

I closed this pull request since I saw merge collisions and it turned out somebody already udpated freeorion to the same version as I with this pull request.

@bjornfor
Copy link
Contributor

bjornfor commented Dec 6, 2017

Oh :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tex @bjornfor @GrahamcOfBorg