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

Bug 12551 Move Trails fixes (aka "baby's first bug fix") #30

Merged
merged 5 commits into from Jul 6, 2020

Conversation

Cattlesquat
Copy link
Collaborator

  • Move trails no longer constantly re-initialized from what should only be starting parameters
  • Move trails can be directly forced on/off/clear without need for indirection through "toggle", etc.

@Cattlesquat Cattlesquat changed the title Bug 12980 fixes (aka "baby's first bug fix") Bug 12551 fixes (aka "baby's first bug fix") Jun 22, 2020
@Cattlesquat
Copy link
Collaborator Author

I thought I was deleting .classpath out of the commit here, not out of the project.

@Cattlesquat
Copy link
Collaborator Author

I think I've at least stopped it from wanting to delete .classpath from the project. No idea how to get it out of the PR which is what I wanted.

@yanlyub
Copy link
Contributor

yanlyub commented Jun 24, 2020

I think I've at least stopped it from wanting to delete .classpath from the project. No idea how to get it out of the PR which is what I wanted.

To get a file out of a PR it needs to be reset to the state it was in before the PR.

@Cattlesquat
Copy link
Collaborator Author

Okay yeah I'd have to figure out how to tell git to show me the history of an individual file (.classpath), and figure out what the reference in it is that I can then set to get that version. I could literally just delete the whole PR and re-make it in probably a 100th the time it would take to figure that out, unless you're ready to create that particular chapter of your Git how-to :-)

@yanlyub
Copy link
Contributor

yanlyub commented Jun 24, 2020

History of a single file, commit messages only: git log path/to/file.txt
History of a single file, full diff per commit: git log -p path/to/file.txt
Find commit hash for the commit you want to go back to, then:
Reset a single file to a certain commit: git checkout <commit hash> -- path/to/file.txt

@Cattlesquat
Copy link
Collaborator Author

Well, maybe that worked, maybe it didn't. It did something. Can't tell.

@Cattlesquat
Copy link
Collaborator Author

Oooh, "files changed" is 1 now -- I guess it DID work -- yay, thanks!

@yanlyub
Copy link
Contributor

yanlyub commented Jun 24, 2020

@uckelman - have a look at https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges#squash-and-merge-your-pull-request-commits , it seems to be possible to squash several commits of a PR so they appear as a single commit in master, this would be good for this PR in particular, otherwise the several changes to .classpath will still end up in master.

@Cattlesquat Cattlesquat changed the title Bug 12551 fixes (aka "baby's first bug fix") Bug 12551 Move Trails fixes (aka "baby's first bug fix") Jun 24, 2020
@Cattlesquat
Copy link
Collaborator Author

I made the new members private, and decluttered the comments. Should be more or less ready.

@uckelman uckelman merged commit eb2effc into vassalengine:master Jul 6, 2020
@Cattlesquat Cattlesquat deleted the Bugfix12980 branch July 13, 2020 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants