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

Re-integrate game-log-parser Scala/SBT project #408

Closed
ScalaWilliam opened this Issue Sep 15, 2017 · 5 comments

Comments

Projects
None yet
2 participants
@ScalaWilliam
Owner

ScalaWilliam commented Sep 15, 2017

As there's no benefit to having it as a separate library.

I'll pay $40 for this (ScalaWilliam Work).
Rules: http://work.scalawilliam.com/rules/
Please post here "I'm taking on this" to lock the task to yourself.

@ScalaWilliam ScalaWilliam changed the title from Re-integrate game-log-parser to Re-integrate game-log-parser (SBT project into another SBT project) Oct 14, 2017

@ScalaWilliam ScalaWilliam changed the title from Re-integrate game-log-parser (SBT project into another SBT project) to Re-integrate game-log-parser Scala/SBT project Oct 14, 2017

@omainegra

This comment has been minimized.

Show comment
Hide comment
@omainegra

omainegra Oct 16, 2017

Contributor

I'm taking on this

Contributor

omainegra commented Oct 16, 2017

I'm taking on this

@ScalaWilliam

This comment has been minimized.

Show comment
Hide comment
@ScalaWilliam

ScalaWilliam Oct 19, 2017

Owner

@omainegra I have to reopen this.

I think you took approach of the first answer you found, but the link was to the second answer of Stack Overflow.

I'm looking at the history now and it's not clear how to interpret it to me. subtree behaves differently from merge.

https://stackoverflow.com/a/10548919 links to the specific answer there:
screen shot 2017-10-20 at 06 57 13

Can you clarify? I always ended up using git merge in my previous attempts.

Owner

ScalaWilliam commented Oct 19, 2017

@omainegra I have to reopen this.

I think you took approach of the first answer you found, but the link was to the second answer of Stack Overflow.

I'm looking at the history now and it's not clear how to interpret it to me. subtree behaves differently from merge.

https://stackoverflow.com/a/10548919 links to the specific answer there:
screen shot 2017-10-20 at 06 57 13

Can you clarify? I always ended up using git merge in my previous attempts.

@ScalaWilliam

This comment has been minimized.

Show comment
Hide comment
@ScalaWilliam

ScalaWilliam Oct 19, 2017

Owner

Ah, now I understand:
I think the problem for me is that it creates a single commit with description-only reference. I'm unable to link up the files via git history as per the git merge approach.

After the PR merge, I noticed I couldn't browse the history "as expected", because it does not preserve that history. Eg look here:
https://github.com/ScalaWilliam/ActionFPS/commits/9a9eb41359ae043dd523aa5ce4717df7decc9814/game-log-parser

When I merged, I was like "wut? where's the history?". I didn't pay attention to when you said you used "git subtree", so my mistake there.

Owner

ScalaWilliam commented Oct 19, 2017

Ah, now I understand:
I think the problem for me is that it creates a single commit with description-only reference. I'm unable to link up the files via git history as per the git merge approach.

After the PR merge, I noticed I couldn't browse the history "as expected", because it does not preserve that history. Eg look here:
https://github.com/ScalaWilliam/ActionFPS/commits/9a9eb41359ae043dd523aa5ce4717df7decc9814/game-log-parser

When I merged, I was like "wut? where's the history?". I didn't pay attention to when you said you used "git subtree", so my mistake there.

@ScalaWilliam

This comment has been minimized.

Show comment
Hide comment
@ScalaWilliam

ScalaWilliam Oct 19, 2017

Owner

I'd think:

  1. Take master of game-log-parser, move all files to game-log-parser directory
  2. Use the merge strategy as per SO
  3. Reapply your changes via:
    • git checkout 90c7d71efb1400b2a3c03a2b27eeaa0595f03afa -- game-log-parser/, git commit - this will just checkout all the files in game-log-parser directory from the work you already done, but not commit anything so you recreate fresh commits
    • and the same for your other commits.

What do you think?

Owner

ScalaWilliam commented Oct 19, 2017

I'd think:

  1. Take master of game-log-parser, move all files to game-log-parser directory
  2. Use the merge strategy as per SO
  3. Reapply your changes via:
    • git checkout 90c7d71efb1400b2a3c03a2b27eeaa0595f03afa -- game-log-parser/, git commit - this will just checkout all the files in game-log-parser directory from the work you already done, but not commit anything so you recreate fresh commits
    • and the same for your other commits.

What do you think?

@omainegra

This comment has been minimized.

Show comment
Hide comment
@omainegra

omainegra Oct 23, 2017

Contributor

It's fine, I'll fix it today

Contributor

omainegra commented Oct 23, 2017

It's fine, I'll fix it today

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