issues
search
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
[testcase notes] #21: pull request functionalities exploration
#35
dorawyy
opened
6 years ago
1
[pull request] testcase21: (base)PR1, (head)PR2
#34
dorawyy
closed
6 years ago
0
add file1 to F1_branch
#33
katherinegy
closed
6 years ago
1
add file1 to F1_branch
#32
katherinegy
closed
6 years ago
0
test2.2
#31
katherinegy
closed
6 years ago
0
[pull request](resolve conflict after last pull request) testcase20_option3: PR1 --> PR2
#30
dorawyy
closed
6 years ago
0
[pull request] testcase20_option3: PR2 --> PR1
#29
dorawyy
closed
6 years ago
0
[pull request] testcase20_option2: PR2 --> PR1
#28
dorawyy
closed
6 years ago
0
[pull request] testcase20: PR2 --> PR1
#27
dorawyy
closed
6 years ago
0
[testcase notes] #20: Pull request, inside one repo, between different branches
#26
dorawyy
opened
6 years ago
2
[testcase notes] (need to work on) #19: rollback after rebasing
#25
dorawyy
opened
7 years ago
0
[testcase notes] (need to work on )#18: revert pull request test
#24
dorawyy
opened
7 years ago
0
Test a
#23
katherinegy
closed
5 years ago
0
Revert "Revert "Pull request between remote/fork repo""
#22
katherinegy
closed
7 years ago
0
Test a
#21
dorawyy
opened
7 years ago
0
Test a
#20
katherinegy
closed
5 years ago
0
[testcase notes] #17: rebase branch Feature2 on Feature3 (multi-commits on Feature3)
#19
dorawyy
opened
7 years ago
0
[testcase notes] #16: rebase branch Feature2 on Feature3 (both commits, same line)
#18
dorawyy
opened
7 years ago
0
[testcase notes] #15: rebase branch Feature2 on Feature3 (both commits, diff files)
#17
dorawyy
opened
7 years ago
0
[testcase notes] #14: rebase branch Feature2 on Feature3 (only commit on Feature2, base branch)
#16
dorawyy
opened
7 years ago
0
[testcase notes] #13: rebase branch Feature2 on Feature3 (only commit on Feature3)
#15
dorawyy
opened
7 years ago
0
Revert "Pull request between remote/fork repo"
#14
katherinegy
closed
7 years ago
0
Pull request between remote/fork repo
#13
katherinegy
closed
7 years ago
0
[testcase notes] #12: rollback ways comparison - `git checkout`, `git revert`, `git reset`
#12
dorawyy
opened
7 years ago
3
[testcase notes] #11: `^` and `~`
#11
dorawyy
opened
7 years ago
0
[testcase notes] #10: merge Feature1 branch to Master branch (both commits, Feature1 branch edited the file that was deleted by master branch)
#10
dorawyy
opened
7 years ago
0
[testcase notes] #9: merge Feature1 branch to Master branch (both commits, same line of the same file)
#9
dorawyy
opened
7 years ago
0
[testcase notes] #8: merge Feature1 branch to Master branch (both commits, diff files)
#8
dorawyy
opened
7 years ago
0
[testcase notes] #7: merge Feature1 branch to Master branch (only Master has new commits)
#7
dorawyy
opened
7 years ago
0
[testcase notes] #6 (aka 5): merge Feature1 branch to Master branch (only Feature1 has new commits)
#6
dorawyy
opened
7 years ago
0
[testcase notes] #5 (aka 4-2): two developers work on the same branch simultaneously (B deleted file modified by A)
#5
dorawyy
opened
7 years ago
0
[testcase notes] #4: two developers work on the same branch simultaneously (B worked on file deleted by A)
#4
dorawyy
opened
7 years ago
2
[testcase notes] #3: two developers work on the same branch simultaneously (diff files)
#3
dorawyy
opened
7 years ago
0
[testcase notes] #2: two developers work on the same branch simultaneously (same file, diff lines)
#2
dorawyy
opened
7 years ago
0
[testcase notes] #1: two developers work on the same branch simultaneously, with conflict
#1
dorawyy
opened
7 years ago
0
Previous