search

Slimmmo / Slimmmo.github.io

AdVenture Capitalist calculator
http://slimmmo.github.io/
35 stars 42 forks source link

LYP - tier 3 cash upgrades #94

Closed dr-ishmael closed 8 years ago

dr-ishmael commented 8 years ago

Also includes the corrected E-Sports speed per #93 .

ricardopetrere commented 8 years ago

Small question: By including the change from my PR inside your PR, you automatically make our PRs conflict with one another. Why? (No offense, really, I just got curious)

dr-ishmael commented 8 years ago

If I make mine match yours, how does that make a conflict? I thought conflicts only happened if we changed the same line in different ways...

I still don't understand all this Github stuff...

ricardopetrere commented 8 years ago

I'm no certified expert on Git (I just learned by using it), but I think that's not how it works. Even though we make the exact same changes on the exact same lines, both take the same original content as reference to "what has changed in this commit?" / "What has been staged to commit?". I think that's how Git works with Diffs: It stores just the changes, original -> new. So, in both our commits, it presumes the value on the base fork (Slimmmo/Slimmmo.github.io) was 1400. Once one of the PRs gets merged, the value on the base fork will no longer be 1400, but 700, and that'll give conflict to the other PR, AFAIK.

But let's see what willl happen

dr-ishmael commented 8 years ago

I suppose you could just cancel yours and let both changes roll in with mine?

On Wed, Aug 10, 2016 at 11:40 PM, Ricardo Petrére notifications@github.com wrote:

I'm no certified expert on Git (I just learned by using it), but I think that's not how it works. Even though we make the exact same changes on the exact same lines, both take the same original content as reference to "what has changed in this commit?" / "What has been staged to commit?". I think that's how Git works with Diffs: It stores just the changes, original -> new. So, in both our commits, it presumes the value on the base fork (Slimmmo/ Slimmmo.github.io) was 1400. Once one of the PRs gets merged, the value on the base fork will no longer be 1400, but 700, and that'll give conflict to the other PR, AFAIK.

But let's see what willl happen

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Slimmmo/Slimmmo.github.io/pull/94#issuecomment-239072843, or mute the thread https://github.com/notifications/unsubscribe-auth/AB1w5z63fLv0hNwd816_kWAcYs1AVms8ks5qeqe5gaJpZM4JhycX .

ricardopetrere commented 8 years ago

Yeah, that'll be the easiest way to solve it. :+1: