gh-icsharpcode/NRefactory
Watch
1
0
Fork
You've already forked NRefactory
 0
Code Issues 64 Pull requests 8 Releases Wiki Activity

Redundant block in branches #308

Open
leoowen19 wants to merge 1 commit from mono-soc-2013/RedundantBlockInBranches into master
pull from: mono-soc-2013/RedundantBlockInBranches
merge into: gh-icsharpcode:master
Conversation 0 Commits 1 Files changed 4 +249
leoowen19 commented 2013-09-01 06:44:54 -05:00 (Migrated from github.com)
No description provided.
This pull request has changes conflicting with the target branch.
  • ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs
  • ICSharpCode.NRefactory.CSharp.Refactoring/ICSharpCode.NRefactory.CSharp.Refactoring.csproj
  • ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/RedundantBlockInDifferentBranchesTests.cs
  • ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'mono-soc-2013/RedundantBlockInBranches:mono-soc-2013/RedundantBlockInBranches'
git switch 'mono-soc-2013/RedundantBlockInBranches'

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 'mono-soc-2013/RedundantBlockInBranches'
git switch 'mono-soc-2013/RedundantBlockInBranches'
git rebase 'master'
git switch 'master'
git merge --ff-only 'mono-soc-2013/RedundantBlockInBranches'
git switch 'mono-soc-2013/RedundantBlockInBranches'
git rebase 'master'
git switch 'master'
git merge --no-ff 'mono-soc-2013/RedundantBlockInBranches'
git switch 'master'
git merge --squash 'mono-soc-2013/RedundantBlockInBranches'
git switch 'master'
git merge --ff-only 'mono-soc-2013/RedundantBlockInBranches'
git switch 'master'
git merge 'mono-soc-2013/RedundantBlockInBranches'
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
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!308
No description provided.