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

Update dotnet (add versions +fix) #839

Merged
merged 72 commits into from
Mar 2, 2019

Conversation

ImperatorS79
Copy link
Contributor

@ImperatorS79 ImperatorS79 commented Jan 22, 2019

The modification are mainly to be closer to winetricks source (since those verbs come from there).

Added dotnet472, which will allow osu to install and fix #705 (upcoming PR), and also maybe paint.net.

Edit: Winetricks/winetricks#971 This could be interesting to implement, for example Space engineers.

@ImperatorS79 ImperatorS79 mentioned this pull request Jan 22, 2019
@ImperatorS79 ImperatorS79 changed the title Updated dotnet (add versions +fix) Update dotnet (add versions +fix) Jan 22, 2019
plata
plata previously requested changes Jan 22, 2019
Engines/Wine/Verbs/dotnet40/script.js Outdated Show resolved Hide resolved
Engines/Wine/Verbs/dotnet40/script.js Outdated Show resolved Hide resolved
Engines/Wine/Verbs/dotnet40/script.js Outdated Show resolved Hide resolved
Engines/Wine/Verbs/dotnet40/script.js Outdated Show resolved Hide resolved
Engines/Wine/Verbs/dotnet46/script.json Show resolved Hide resolved
Engines/Wine/Verbs/dotnet461/script.js Outdated Show resolved Hide resolved
@ImperatorS79
Copy link
Contributor Author

I do not manage to fix the conflicts by following the command line instructions, so if anyone more experienced could try, that would be great.

@plata
Copy link
Collaborator

plata commented Feb 27, 2019

Normally, if you merge master this should solve the conflicts.

@ImperatorS79
Copy link
Contributor Author

This would lead to conflicts.

@plata
Copy link
Collaborator

plata commented Feb 27, 2019

Sure, you need to resolve the conflicts during the merge.

@ImperatorS79
Copy link
Contributor Author

And I do not know how to do it ^^.

@plata
Copy link
Collaborator

plata commented Feb 27, 2019

https://git-scm.com/docs/git-merge

Basically:

git merge master
git mergetool -t meld
git commit

@ImperatorS79
Copy link
Contributor Author

Where ? In my local repo ? On the dotnet branch ? How to I keep what I have committed ?

@Zemogiter
Copy link
Contributor

What I do is just click on the "Resolve confilcts" button on the website and manually remove conflicts.

@ImperatorS79
Copy link
Contributor Author

This button is greyed because "conflicts are too complex" -_-'.

@Zemogiter
Copy link
Contributor

lol how could a couple of lines be too complex?

@ImperatorS79
Copy link
Contributor Author

¯_(ツ)_/¯

@Zemogiter
Copy link
Contributor

I found this. Not sure if it helps though:
https://ashfurrow.com/blog/resolving-github-merge-conflicts/

@plata
Copy link
Collaborator

plata commented Feb 27, 2019

@ImperatorS79 in your local clone with the branch you used to create the PR (your master branch needs to be up to date of course).

@ImperatorS79
Copy link
Contributor Author

Hoping nothing else must be changed ^^.

@ImperatorS79 ImperatorS79 merged commit dbc073b into PhoenicisOrg:master Mar 2, 2019
@plata
Copy link
Collaborator

plata commented Mar 2, 2019

Some of the files changed from 644 to 755. Is that on purpose?

@ImperatorS79
Copy link
Contributor Author

Really ? I did not modified any permission on my pc.

@ImperatorS79 ImperatorS79 deleted the dotnet branch March 2, 2019 11:51
@plata
Copy link
Collaborator

plata commented Mar 2, 2019

At least the diff says so...

@Kreyren Kreyren mentioned this pull request Mar 8, 2019
petermetz pushed a commit to petermetz/scripts that referenced this pull request Jun 7, 2020
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.

osu! errors out when installing
5 participants