gh-icsharpcode/AvalonEdit
Watch
1
0
Fork
You've already forked AvalonEdit
 0
Code Issues 101 Pull requests 17 Releases 11 Wiki Activity

extend search panel by replace posibility and add keyboard shortcuts #99

Open
OidaTiftla wants to merge 13 commits from OidaTiftla/master into master
pull from: OidaTiftla/master
merge into: gh-icsharpcode:master
Conversation 0 Commits 13 Files changed 11 +300 -52
OidaTiftla commented 2016-11-18 06:16:56 -06:00 (Migrated from github.com)
No description provided.
👍 1
This pull request has changes conflicting with the target branch.
  • ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
  • ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.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 'OidaTiftla/master:OidaTiftla/master'
git switch 'OidaTiftla/master'

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 'OidaTiftla/master'
git switch 'OidaTiftla/master'
git rebase 'master'
git switch 'master'
git merge --ff-only 'OidaTiftla/master'
git switch 'OidaTiftla/master'
git rebase 'master'
git switch 'master'
git merge --no-ff 'OidaTiftla/master'
git switch 'master'
git merge --squash 'OidaTiftla/master'
git switch 'master'
git merge --ff-only 'OidaTiftla/master'
git switch 'master'
git merge 'OidaTiftla/master'
git push origin 'master'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Area-Accessibility

   
Area-Build

   
Area-CodeCompletion

   
Area-Document

   
Area-Documentation

   
Area-Editing

   
Area-Folding

   
Area-Highlighting

   
Area-i18n

   
Area-Indentation

   
Area-NetFx

   
Area-Rendering

   
Area-Search

   
Area-Snippets

   
dependencies
Pull requests that update a dependency file

  
duplicate

   
Feedback Needed

   
help wanted

   
invalid

   
Issue-Bug

   
Issue-Discussion

   
Issue-Enhancement

   
Issue-Performance

   
Issue-Question

   
on-hold

   
Resolution-Answered

   
Resolution-By Design

   
Resolution-Duplicate

   
Resolution-Fixed

   
Resolution-Won't Fix

   
Up-for-Grabs
No labels
Area-Accessibility
Area-Build
Area-CodeCompletion
Area-Document
Area-Documentation
Area-Editing
Area-Folding
Area-Highlighting
Area-i18n
Area-Indentation
Area-NetFx
Area-Rendering
Area-Search
Area-Snippets
dependencies
duplicate
Feedback Needed
help wanted
invalid
Issue-Bug
Issue-Discussion
Issue-Enhancement
Issue-Performance
Issue-Question
on-hold
Resolution-Answered
Resolution-By Design
Resolution-Duplicate
Resolution-Fixed
Resolution-Won't Fix
Up-for-Grabs
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/AvalonEdit!99
No description provided.