Details
-
Sub-task
-
Status: Resolved
-
Major
-
Resolution: Fixed
-
Edit log branch (HDFS-1073)
-
None
-
Reviewed
Description
When merging from trunk into branch, it's pretty difficult to resolve conflicts around the layout versions, since trunk keeps swallowing whatever layout version I've picked in the branch. Adding a couple of constants will make the merges much easier.