dorawyy git-merge-conflicts-test issues

dorawyy / git-merge-conflicts-test

This repo is for testing of git functionalities / different merging conflict scenarios, and CI tools usage

2 stars 4 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Layered architecture vs. MVC

#85 dorawyy closed 8 months ago
0
Pr1

#84 ahmedAbdElkreemMosa opened 2 years ago
0
Test cross-repo PR merge

#83 wyingying08 closed 4 years ago
1
You're doing amazing work here

#82 jquast closed 6 years ago
3
0109 CI test - merge master back to Feature1 branch

#81 dorawyy closed 6 years ago
0
Travis CI tutorial

#80 dorawyy closed 6 years ago
1
TestF, fork, 1: x=1,y=1,z=1

#79 yingying93wang closed 6 years ago
0
[testcase notes] #31: Conflict, default commit messages

#78 dorawyy opened 6 years ago
3
[testcase notes] pull request

#77 dorawyy closed 6 years ago
0
[testcase notes] #30: git rebase test cases scratches

#76 dorawyy opened 6 years ago
3
[testcase notes] #29: Git merge categorization

#75 dorawyy opened 6 years ago
2
PR2: create file test28_pull_request: a=1,b=1,c=1

#74 dorawyy closed 6 years ago
0
[testcase notes]#28: Pull Request, new conflicts coming with new commits

#73 dorawyy opened 6 years ago
2
[concept] JGit tutorial

#72 dorawyy opened 6 years ago
2
[concept] .git - JGit

#71 dorawyy opened 6 years ago
0
[concept] Forks

#70 dorawyy opened 6 years ago
0
[concept] Rebasing v.s. Merging

#69 dorawyy opened 6 years ago
1
[concept] CLONE, FETCH, MERGE, PULL

#68 dorawyy opened 6 years ago
0
[concept] Rationale for Github pull request

#67 dorawyy opened 6 years ago
7
[testcase notes] #27: `git rebase` options

#66 dorawyy opened 6 years ago
3
[concept] ORIG_HEAD, FETCH_HEAD, MERGE_HEAD etc

#65 dorawyy opened 6 years ago
0
[testcase notes] #26: `git merge` options

#64 dorawyy opened 6 years ago
3
[testcase notes] #25: Git reflog

#63 dorawyy opened 6 years ago
0
[testcase notes] #24: Different Merge Strategies Test

#62 dorawyy opened 6 years ago
1
add file1 to F1_branch

#61 katherinegy closed 6 years ago
0
[pull request] testcase23_option2: (base) PR1, (head) PR2

#60 dorawyy closed 6 years ago
0
[pull request] testcase23: (base) PR1, (head) PR2

#59 dorawyy closed 6 years ago
0
add file1 to F1_branch

#58 katherinegy closed 6 years ago
0
add file1 to F1_branch

#57 katherinegy closed 6 years ago
0
[testcase notes] #23: Pull request, different branches inside one repo, both commits, conflict

#56 dorawyy opened 6 years ago
1
add file1 to F1_branch

#55 katherinegy closed 6 years ago
0
add file1 to F1_branch

#54 katherinegy closed 6 years ago
0
add file1 to F1_branch

#53 katherinegy closed 6 years ago
0
[pull request] testcase22_option3 (test rebase after rebase): (base) PR1, (head) PR2

#52 dorawyy closed 6 years ago
0
add file1 to F1_branch

#51 katherinegy closed 6 years ago
0
[pull request] testcase22_option3 (test rebase after rebase): (base) PR2, (head) PR1

#50 dorawyy closed 6 years ago
0
[pull request] testcase22_option3: (base) PR1, (head) PR2

#49 dorawyy closed 6 years ago
0
add file1 to F1_branch

#48 katherinegy closed 6 years ago
0
add file1 to F1_branch

#47 katherinegy closed 6 years ago
0
add file1 to F1_branch

#46 katherinegy closed 6 years ago
0
[pull request] testcase22_option2 (test rebase after squash): (base) PR1, (head) PR2

#45 dorawyy closed 6 years ago
0
[pull request] testcase22_option2 (test rebase after squash): (base) PR2, (head) PR1

#44 dorawyy closed 6 years ago
0
[pull request] testcase22_option2: (base) PR1, (head) PR2

#43 dorawyy closed 6 years ago
0
add file1 to F1_branch

#42 katherinegy closed 6 years ago
0
add file1 to F1_branch

#41 katherinegy closed 6 years ago
0
add file1 to F1_branch

#40 katherinegy closed 6 years ago
0
[pull request] testcase22_order_test: (base) PR1, (head) PR2

#39 dorawyy closed 6 years ago
0
[testcase notes] #22: Pull request, different branches inside one repo, both commits, no conflict

#38 dorawyy opened 6 years ago
2
[pull request] testcase22: (base) PR1, (head) PR2

#37 dorawyy closed 6 years ago
0
add file1 to F1_branch

#36 katherinegy closed 6 years ago
0