Fork: 0
nitta-lab / GitTest

A matsumoto #9

Closed a-matsumoto wants to merge 5 commits into nitta-lab:master from nitta-lab:a-matsumoto
Patch
Unified Split
Showing 6 changed files
View
6
■■■■■
 .idea/encodings.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/GitTest/src/Main.java" charset="Shift_JIS" />
</component>
</project>
View
6
■■■■■
 .idea/misc.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" project-jdk-name="9.0" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
View
8
■■■■■
 .idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/GitTest/GitTest.iml" filepath="$PROJECT_DIR$/GitTest/GitTest.iml" />
</modules>
</component>
</project>
View
6
■■■■■
 .idea/vcs.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
View
11
■■■■■
 GitTest/GitTest.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
View
12
■■■■■
 GitTest/src/Main.java
 
public class Main {
 
public static void main(String[] args) {
System.out.println("branch1で普通に変更");
System.out.println("branch2 でbranch1と競合する修正を行う");
System.out.println("master側で競合が解消されたのを無視したままbranch2でも更に変更");
System.out.println("master側で競合が解消されたのを無視したままbranch1で更に変更");
System.out.println("新田直也");
System.out.println("branch1�ŕ��ʂɕύX");
System.out.println("branch2 ��branch1�Ƌ�������C�����s��");
System.out.println("master���ŋ������������ꂽ�̂𖳎������܂�branch2�ł��X�ɕύX");
System.out.println("master���ŋ������������ꂽ�̂𖳎������܂�branch1�ōX�ɕύX");
System.out.println("�V�c����");
System.out.println("a-matsumoto�ł�����v(���֥�)v");
}
 
}