Skip to content
GitLab
Explore
Sign in
project
conflict
Tags
Tags give the ability to mark specific points in history as being important
3.0.0-alpha5
78da0f36
·
Issue
#3415285
by dineshkumarbollu, Onnia: Remove jQuery once dependency
·
Apr 13, 2024
8.x-2.0-alpha5
db55c5bb
·
Issue
#3415285
by dineshkumarbollu, Onnia: Remove jQuery once dependency
·
Apr 13, 2024
8.x-2.0-alpha4
5d35ef84
·
Issue
#3333138
by wilco, serg.linkin: Original language entity content got...
·
Apr 13, 2024
3.0.0-alpha4
0c2769b9
·
Issue
#3333138
by wilco, serg.linkin: Original language entity content got...
·
Apr 13, 2024
8.x-2.0-alpha3
279232d1
·
Issue
#3286695
: Automated Drupal 10 compatibility fixes
·
Nov 22, 2022
7.x-1.1
9a0953a3
·
Issue
#2552405
: If an unlimited-cardinality field has been added to by both...
·
Aug 08, 2020
7.x-1.1-rc1
9a0953a3
·
Issue
#2552405
: If an unlimited-cardinality field has been added to by both...
·
Aug 08, 2020
8.x-2.0-alpha2
05d0b0f7
·
Issue
#3122375
by katherined, effulgentsia, jungle: Add conflict.schema.yml
·
Apr 15, 2020
8.x-2.0-alpha1
f4a680d7
·
Issue
#2999652
by szeidler, hchonov: User should get feedback about applied auto merges
·
Sep 18, 2018
8.x-1.0
8c03e9cc
·
Preparing for stable release
·
Apr 30, 2017
8.x-1.0-beta1
d7ae3f10
·
Run Travis tests with Drupal 8.3.
·
Oct 26, 2016
8.x-1.0-alpha1
54f90341
·
Do not allow tests to fail with Drupal 8.2.x in Travis CI.
·
Aug 02, 2016
7.x-1.0
b0f19c37
·
#1599490
Highlight modified and conflicting fields during conflict resolution
·
Oct 10, 2014
7.x-0.1
1b7c6c6e
·
Fix
#1599480
by dww: Use a more neutral tone in message.
·
Jun 29, 2012