Skip to content

Manual merge branch 'master'

Administrator requested to merge github/fork/madppiper/main into main

Created by: madppiper

@philipp-spiess

I ended up preparing a manual merge of my local changes to main. I am being hopeful that this may make the previous merge easier.

After applying the changes, I'd suggest to do a second merge with your master branch, as it contains changes from @vdavid. We should probably remove "master" afterwards, so that this doesn't happen again.

# Conflicts:
#	README.md
#	src/main/java/Search.java
#	src/main/java/SearchRepository.java
#	src/main/java/com/sourcegraph/action/FileAction.java
#	src/main/java/com/sourcegraph/action/OpenRevisionAction.java
#	src/main/java/com/sourcegraph/action/SearchActionBase.java
#	src/main/java/com/sourcegraph/project/CommitViewUriBuilder.java
#	src/main/java/com/sourcegraph/project/SourcegraphConfig.java
#	src/main/java/com/sourcegraph/util/SourcegraphUtil.java
#	src/main/resources/META-INF/plugin.xml

Test plan

None

Merge request reports