Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-08 08:32:12 +01:00
Code Issues Packages Projects Releases Activity
9,258 Commits 34 Branches 209 Tags
33037385e4a5fc33ad43074f7ea303acbfbdf60d
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Rene Pfeuffer 33037385e4 Handle unexpected merge results 
It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.
2020-02-27 09:56:25 +01:00
.mvn/wrapper
Jenkins: Run maven build in docker.
2018-09-12 17:59:03 +02:00
deployments/helm
added init container to install plugins
2018-11-26 16:55:29 +01:00
docs
added missing requires element to extension
2020-01-09 08:19:13 +01:00
scm-annotation-processor
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
scm-annotations
Fix JavaDoc builds for java > 8
2020-02-06 11:52:24 +01:00
scm-core
merge with default branch
2020-02-25 08:24:12 +01:00
scm-dao-xml
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
scm-it
implemented simple ClassLoaderLifeCycle to fix integration tests on Java > 8
2020-02-04 15:59:11 +01:00
scm-plugins
Handle unexpected merge results
2020-02-27 09:56:25 +01:00
scm-server
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
scm-test
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
scm-ui
Merge with upstream
2020-02-25 16:22:54 +01:00
scm-webapp
Handle unexpected merge results
2020-02-27 09:56:25 +01:00
.dockerignore
added docker image build step
2018-09-24 13:03:02 +02:00
.editorconfig
added editorconfig file
2016-06-26 15:04:55 +02:00
.eslintrc
addded central eslint-config
2019-10-08 09:29:11 +02:00
.gitignore
added .gitignore for git mirrors
2011-04-05 17:06:34 +02:00
.hgignore
show loading state on buttons in UserRow
2018-07-18 09:35:16 +02:00
CHANGELOG.md
Merge with upstream
2020-02-25 16:22:54 +01:00
Dockerfile
Update to latest java 8 alpine docker image
2020-02-13 16:19:22 +01:00
Jenkinsfile
Enable tests for mercurial
2020-02-27 08:36:47 +01:00
lerna.json
Prepare for next development iteration
2020-02-03 13:42:29 +01:00
LICENSE.txt
added license file to the root of the repository
2013-08-23 12:33:24 +02:00
lombok.config
Upgrade Lombok to v1.18.10 in order to fix build on Java versions > 8
2020-02-03 14:53:26 +01:00
mvnw
Add mvn wrapper scripts for Jenkins build
2018-05-31 12:40:37 +02:00
mvnw.cmd
Add mvn wrapper scripts for Jenkins build
2018-05-31 12:40:37 +02:00
package.json
split lowlight languages out of the worker bundle
2020-01-27 13:30:46 +01:00
pom.xml
merge with default branch
2020-02-25 08:24:12 +01:00
README.md
added readme for the default branch
2014-01-06 11:35:46 +01:00
yarn.lock
Prepare for next development iteration
2020-02-03 13:42:29 +01:00

README.md

SCM-Manager

This branch (default) is for the development of scm-manager 2.x. If you are interested in the development of version 1.x, please checkout the 1.x branch.

Reference in New Issue View Git Blame Copy Permalink
Description
The easiest way to share and manage your Git, Mercurial and Subversion repositories over http.
https://scm-manager.org/
cloudogugithgjavamercurialscmscm-managersubversionsvn
Readme 177 MiB
Languages
Java 75.6%
TypeScript 19.6%
CSS 2.1%
HTML 1%
Groovy 0.4%
Other 1.3%