Github files WIP

[isaacabraham]

As per previous WIP PR for #9. However, this one actually builds!

[forki]

sorry about this, but could you please rebase on current master?

[isaacabraham]

Yeah, will do tonight. Have there been any major changes since the weekend?

[forki]

Unfortunatly yes.
#86

2014-09-15 17:30 GMT+02:00 Isaac Abraham [email protected]:

Yeah, will do tonight. Have there been any major changes since the weekend?

—
Reply to this email directly or view it on GitHub
#96 (comment).

[isaacabraham]

Hmmm. I've seen that "cleanup" commit already - it was what broke the previous PR. This PR should actually cater for that, and indeed it wasn't complaining about merge conflicts when I submitted it, so it must be something else that's caused the conflict.

[forki]

oh it doesn't have a "git merge conflict", but the merged file is invalid.

2014-09-15 18:05 GMT+02:00 Isaac Abraham [email protected]:

Hmmm. I've seen that "cleanup" commit already - it was what broke the
previous PR. This PR should actually cater for that, and indeed it wasn't
complaining about merge conflicts when I submitted it, so it must be
something else that's caused the conflict.

—
Reply to this email directly or view it on GitHub
#96 (comment).

[isaacabraham]

Are you sure that's for this PR? The other one was invalid, this one shouldn't be.

[forki]

Mhm. The merge doesn't build on my machine.
On Sep 15, 2014 6:55 PM, "Isaac Abraham" [email protected] wrote:

Are you sure that's for this PR? The other one was invalid, this one
shouldn't be.

—
Reply to this email directly or view it on GitHub
#96 (comment).

[isaacabraham]

Merge to what - which commit?

[forki]

I merged to master and the build failed.
On Sep 15, 2014 7:02 PM, "Isaac Abraham" [email protected] wrote:

Merge to what?

—
Reply to this email directly or view it on GitHub
#96 (comment).

[forki]

but don't worry. Will try again - and make it work.

[isaacabraham]

I renamed the Resolver.fs file to PackageResolve.fs - that might be the cause of the conflict.

[theimowski]

Maybe we could add merge=text for the *.fs files in the .gitattributes file
https://github.com/fsprojects/Paket/blob/master/.gitattributes#L8
Now, default behavior for merging *.fs files is union which doesn't spot any conflicts when merging.

[forki]

@theimowski nice catch. 2be02dd

[forki]

I merged it because I really need such a feature right now.

[isaacabraham]

Cool. Did it get all the code I merged in this morning (which actually modifies the project file)?

I haven't tested it on an fsproj ever - just that test csproj.

[forki]

Mhm Yes I hope I merged everything. Please review the last commits
On Sep 16, 2014 12:18 PM, "Isaac Abraham" [email protected] wrote:

Cool. Did it get all the code I merged in this morning (which actually
modifies the project file)?

I haven't tested it on an fsproj ever - just that test csproj.

—
Reply to this email directly or view it on GitHub
#96 (comment).

[isaacabraham]

Yes looks like it all got in.

From: Steffen Forkmann [mailto:[email protected]]
Sent: 16 September 2014 11:21
To: fsprojects/Paket
Cc: Isaac Abraham
Subject: Re: [Paket] Github files WIP (#96)

Mhm Yes I hope I merged everything. Please review the last commits
On Sep 16, 2014 12:18 PM, "Isaac Abraham" <[email protected] mailto:[email protected] > wrote:

Cool. Did it get all the code I merged in this morning (which actually
modifies the project file)?

I haven't tested it on an fsproj ever - just that test csproj.

—
Reply to this email directly or view it on GitHub
#96 (comment).

—
Reply to this email directly or view it on GitHub #96 (comment) . https://github.com/notifications/beacon/1781813__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcyNjQ4MjA1MiwiZGF0YSI6eyJpZCI6NDI0MTg2Nzd9fQ==--cf198b3fb0abb516023e6edef7c6720a8bad2239.gif