dorawyy/git-merge-conflicts-test
This repo is for testing of git functionalities / different merging conflict scenarios, and CI tools usage
Java
Issues
- 0
Layered architecture vs. MVC
#85 opened by dorawyy - 3
You're doing amazing work here
#82 opened by jquast - 1
Travis CI tutorial
#80 opened by dorawyy - 3
[testcase notes] #26: `git merge` options
#64 opened by dorawyy - 3
- 7
[concept] Rationale for Github pull request
#67 opened by dorawyy - 3
[testcase notes] #12: rollback ways comparison - `git checkout`, `git revert`, `git reset`
#12 opened by dorawyy - 0
[testcase notes] #1: two developers work on the same branch simultaneously, with conflict
#1 opened by dorawyy - 0
[testcase notes] #2: two developers work on the same branch simultaneously (same file, diff lines)
#2 opened by dorawyy - 2
[testcase notes] #4: two developers work on the same branch simultaneously (B worked on file deleted by A)
#4 opened by dorawyy - 0
[testcase notes] #9: merge Feature1 branch to Master branch (both commits, same line of the same file)
#9 opened by dorawyy - 0
[testcase notes] #8: merge Feature1 branch to Master branch (both commits, diff files)
#8 opened by dorawyy - 0
[testcase notes] #6 (aka 5): merge Feature1 branch to Master branch (only Feature1 has new commits)
#6 opened by dorawyy - 0
[testcase notes] #16: rebase branch Feature2 on Feature3 (both commits, same line)
#18 opened by dorawyy - 0
[testcase notes] #15: rebase branch Feature2 on Feature3 (both commits, diff files)
#17 opened by dorawyy - 3
[testcase notes] #27: `git rebase` options
#66 opened by dorawyy - 0
[testcase notes] pull request
#77 opened by dorawyy - 3
- 2
[testcase notes] #29: Git merge categorization
#75 opened by dorawyy - 2
- 0
[concept] .git - JGit
#71 opened by dorawyy - 0
[testcase notes] #25: Git reflog
#63 opened by dorawyy - 1
- 1
[testcase notes] #23: Pull request, different branches inside one repo, both commits, conflict
#56 opened by dorawyy - 1
- 0
- 0
- 0
[testcase notes] #17: rebase branch Feature2 on Feature3 (multi-commits on Feature3)
#19 opened by dorawyy - 0
[testcase notes] #14: rebase branch Feature2 on Feature3 (only commit on Feature2, base branch)
#16 opened by dorawyy - 0
[testcase notes] #13: rebase branch Feature2 on Feature3 (only commit on Feature3)
#15 opened by dorawyy - 0
[testcase notes] #11: `^` and `~`
#11 opened by dorawyy - 0
[testcase notes] #10: merge Feature1 branch to Master branch (both commits, Feature1 branch edited the file that was deleted by master branch)
#10 opened by dorawyy - 0
[testcase notes] #7: merge Feature1 branch to Master branch (only Master has new commits)
#7 opened by dorawyy - 0
[testcase notes] #5 (aka 4-2): two developers work on the same branch simultaneously (B deleted file modified by A)
#5 opened by dorawyy - 0
[testcase notes] #3: two developers work on the same branch simultaneously (diff files)
#3 opened by dorawyy - 2
[concept] JGit tutorial
#72 opened by dorawyy - 1
[concept] Rebasing v.s. Merging
#69 opened by dorawyy - 2
[testcase notes] #20: Pull request, inside one repo, between different branches
#26 opened by dorawyy - 2
[testcase notes] #22: Pull request, different branches inside one repo, both commits, no conflict
#38 opened by dorawyy - 0
[concept] ORIG_HEAD, FETCH_HEAD, MERGE_HEAD etc
#65 opened by dorawyy - 0
[concept] CLONE, FETCH, MERGE, PULL
#68 opened by dorawyy - 0
[concept] Forks
#70 opened by dorawyy