[Dart-dev] svn:mergeinfo/ Revision: 10929

[dart at ucar.edu]

thoar at ucar.edu
2017-01-20 14:11:31 -0700 (Fri, 20 Jan 2017)
1052
Fixing conflict in hopes that I can now update to be consistent with the trunk.

This change was necessitated as the result of the following:

1[1270] yslogin6:/<1>scratch/thoar/wrf_chem_dart $ svn merge -r4680:10928
https://svn-dares-dart.cgd.ucar.edu/DART/trunk | & tee my_log3.txt
--- Merging r4918 into 'mkmf/mkmf.template.intel.linux':
C    mkmf/mkmf.template.intel.linux
--- Recording mergeinfo for merge of r4681 through r4918 into '.':
 U   .
--- Recording mergeinfo for merge of r4681 through r4918 into
'mkmf/mkmf.template.intel.linux':
 U   mkmf/mkmf.template.intel.linux
Conflict discovered in file 'mkmf/mkmf.template.intel.linux'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
        (mc) my side of conflict, (tc) their side of conflict,
        (s) show all options: p
Summary of conflicts:
  Text conflicts: 1
svn: E155015: One or more conflicts were produced while merging r4917:4918
into
'/glade/scratch/thoar/wrf_chem_dart' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions





Index: DART/branches/mizzi/mkmf/mkmf.template.intel.linux
===================================================================
--- DART/branches/mizzi/mkmf/mkmf.template.intel.linux	2017-01-20 21:05:26 UTC (rev 10928)
+++ DART/branches/mizzi/mkmf/mkmf.template.intel.linux	2017-01-20 21:11:31 UTC (rev 10929)

Property changes on: DART/branches/mizzi/mkmf/mkmf.template.intel.linux
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
 /DART/branches/development/mkmf/mkmf.template.intel.linux:4680-6255
 /DART/branches/gitm/mkmf/mkmf.template.intel.linux:5143-6215
 /DART/branches/gitm_lanai/mkmf/mkmf.template.intel.linux:6571-6652
-/DART/branches/helen/mkmf/mkmf.template.intel.linux:5995-6161
\ No newline at end of property
+/DART/branches/helen/mkmf/mkmf.template.intel.linux:5995-6161
+/DART/trunk/mkmf/mkmf.template.intel.linux:4681-4918
\ No newline at end of property