This website requires JavaScript.
Explore
Help
Sign In
kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
Watch
1
Star
0
Fork
You've already forked gitlab-org--gitlab-foss
0
Code
Releases
Activity
dcb79741a1
gitlab-org--gitlab-foss
/
lib
/
gitlab
/
git
/
conflict
History
Ahmad Sherif
b4b267b739
Migrate Repository#can_be_merged? to Gitaly
2018-01-11 16:40:13 +01:00
..
file.rb
Simplify conflict resolution interface and code
2018-01-02 16:22:02 -03:00
parser.rb
Create a Gitlab::Git submodule for conlict-related files
2017-10-12 22:03:15 -03:00
resolution.rb
Simplify conflict resolution interface and code
2018-01-02 16:22:02 -03:00
resolver.rb
Migrate Repository#can_be_merged? to Gitaly
2018-01-11 16:40:13 +01:00