Internalize deps #512

Open

sushihangover wants to merge 16 commits from PlayScriptRedux/internalize-deps into master

pull from: PlayScriptRedux/internalize-deps

merge into: gh-icsharpcode:master

gh-icsharpcode:master

gh-icsharpcode:archive/20260925T204457Z-rescue/viktor-evdokimov/patch-1

gh-icsharpcode:archive/20260925T204457Z-rescue/PlayScriptRedux/internalize-deps

gh-icsharpcode:archive/20260925T204457Z-rescue/vendettamit/patch-1

gh-icsharpcode:archive/20260925T204457Z-rescue/Pomakhin/master

gh-icsharpcode:archive/20260925T204457Z-rescue/yuske/master

gh-icsharpcode:archive/20260925T204457Z-rescue/luiscubal/windows-only-resolver-bug

gh-icsharpcode:archive/20260925T204457Z-rescue/mono-soc-2013/RedundantBlockInBranches

Conversation 0 Commits 16 Files changed 1466 +51811 -14698

sushihangover commented 2016-01-13 01:45:19 -06:00 (Migrated from github.com)

• Copy link

No description provided.

This pull request has changes conflicting with the target branch.

• ICSharpCode.NRefactory.Cecil/ICSharpCode.NRefactory.PlayScript.Cecil.csproj
• ICSharpCode.NRefactory.PlayScript.Refactoring/ICSharpCode.NRefactory.PlayScript.Refactoring.csproj
• ICSharpCode.NRefactory.PlayScript/ICSharpCode.NRefactory.PlayScript.csproj

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Internalize deps' (#512) from PlayScriptRedux/internalize-deps into master

Merge commit body Reviewed-on: https://git.richey.dev/gh-icsharpcode/NRefactory/pulls/512

Merge pull request 'Internalize deps' (#512) from PlayScriptRedux/internalize-deps into master Reviewed-on: https://git.richey.dev/gh-icsharpcode/NRefactory/pulls/512 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 'PlayScriptRedux/internalize-deps:PlayScriptRedux/internalize-deps'

git switch 'PlayScriptRedux/internalize-deps'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'master'

git merge --no-ff 'PlayScriptRedux/internalize-deps'

git switch 'PlayScriptRedux/internalize-deps'

git rebase 'master'

git switch 'master'

git merge --ff-only 'PlayScriptRedux/internalize-deps'

git switch 'PlayScriptRedux/internalize-deps'

git rebase 'master'

git switch 'master'

git merge --no-ff 'PlayScriptRedux/internalize-deps'

git switch 'master'

git merge --squash 'PlayScriptRedux/internalize-deps'

git switch 'master'

git merge --ff-only 'PlayScriptRedux/internalize-deps'

git switch 'master'

git merge 'PlayScriptRedux/internalize-deps'

git push origin 'master'

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

Bug

  

Feature Request

  

NR6Pack

No labels

Bug

Feature Request

NR6Pack

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

gh-icsharpcode/NRefactory!512

No description provided.