-
Notifications
You must be signed in to change notification settings - Fork 49
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
Conversation
Merge Phoenicis/Scripts:master into ImperatorS79/Scripts:master
updated Hearthstone (download application directly) (PhoenicisOrg#383)
Merge master
Merge recent commits
Merge master
Merge master
Merge master
Merge master
Merge master
Merge master
Merge master
Merge master
Merge master
Merge master
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. |
Merge master
Normally, if you merge master this should solve the conflicts. |
This would lead to conflicts. |
Sure, you need to resolve the conflicts during the merge. |
And I do not know how to do it ^^. |
https://git-scm.com/docs/git-merge Basically:
|
Where ? In my local repo ? On the dotnet branch ? How to I keep what I have committed ? |
What I do is just click on the "Resolve confilcts" button on the website and manually remove conflicts. |
This button is greyed because "conflicts are too complex" -_-'. |
lol how could a couple of lines be too complex? |
¯_(ツ)_/¯ |
I found this. Not sure if it helps though: |
@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). |
Hoping nothing else must be changed ^^. |
Some of the files changed from 644 to 755. Is that on purpose? |
Really ? I did not modified any permission on my pc. |
At least the diff says so... |
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.