git-merge-conflicts-test

This repo is for testing of git functionalities / different merging conflict scenarios

Name		Name	Last commit message	Last commit date
Latest commit History 91 Commits
.github/workflows		.github/workflows
codacyTest		codacyTest
test @ 5cb4ca0		test @ 5cb4ca0
.eslintrc.json		.eslintrc.json
.gitmodules		.gitmodules
README.md		README.md
TestP1		TestP1
checkstyle.xml		checkstyle.xml
file1		file1
file2		file2
main.java		main.java
ruleset.xml		ruleset.xml
test-cross-repo-PR-merge		test-cross-repo-PR-merge
test-cross-repo-PR-merge2		test-cross-repo-PR-merge2
test.js		test.js
test11		test11
test5		test5
test7		test7
test8-1		test8-1
test8-2		test8-2
test9		test9
testcase2		testcase2
tslint.json		tslint.json

Provide feedback