Changeset 1079

Timestamp:

07/26/16 15:16:47 (8 years ago)

Author:

davidb

Message:

Comments added to track some useful StackOverflow articles on custom git-merging

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Misc.java

@@ -1451 +1451 @@
 
     // Some experimental actions to do with keeping framesets stored within a Git repository
+
+
+    // For custom merge, some potentially useful information at:
+    //   http://stackoverflow.com/questions/23140240/git-how-do-i-add-a-custom-merge-strategy
+    //   http://stackoverflow.com/questions/7607125/git-merge-conflict-to-always-take-the-newest-file
+    
     protected static String gitexe = "git";