Closed fronbow closed 6 years ago
Ezriilc
commented
6 years ago Do we need .gitattributes in the repo? I'd keep the .version file out of it too (and just do that locally), but CKAN looks at it here.
What about .gitignore, can that be ignored? EDIT: This didn't seem dumb when I typed it, but now...
Is there a way for me to merge a PR minus one or more commits?
fronbow
commented
6 years ago You need to keep both .git* files as they're used when anyone clones a repo (for their local client to know what file-types are accepted).
I think you might be able to manually merge it - from what I can tell it's the csproj file that's causing a conflict.
On 21 December 2017 at 23:44, Ezriilc notifications@github.com wrote:
Do we need .gitattributes in the repo? I'd keep the .version file out of it too (and just do that locally), but CKAN looks at it here. What about .gitignore, can that be ignored?
Is there a way for me to merge a PR minus one or more commits?
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/Ezriilc/HyperEdit/pull/37#issuecomment-353485901, or mute the thread https://github.com/notifications/unsubscribe-auth/ABWhO8ri26CnrFgcW6ZDvqJYxCDH3bHxks5tCu1sgaJpZM4RKeLz .
--
@fronbow [Martin Frost]
fronbow
commented
6 years ago It should've resolved now? Ooops, I'd need write access to resolve :( Click the resolve conflicts button and tidy up the version file - you'll notice the bits that are out of place!
Ezriilc
commented
6 years ago Sorry for the confusion. I've added a note in the README to leave .version unaltered.
Yea, I think it's good to go. I plan to build this as a 4th BETA and leave it for a day or 2 before doing a full release. Just in case there's any little things that need ironing out.
Ezriilc
commented
6 years ago Something tells me that we need .csproj in there, so forks know which references we're using..., but I may be confused again. We'll see how this goes.
fronbow
commented
6 years ago Yeah, we're all learning together!! Let's see how it goes :)
On 22 December 2017 at 00:09, Ezriilc notifications@github.com wrote:
Something tells me that we need .csproj in there, so forks know which references we're using..., but I may be confused again. We'll see how this goes.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Ezriilc/HyperEdit/pull/37#issuecomment-353489371, or mute the thread https://github.com/notifications/unsubscribe-auth/ABWhO8ZuAb0C52bwp9SkFU3dvi1Y8IYIks5tCvMrgaJpZM4RKeLz .
--
@fronbow [Martin Frost]
This should be ok?