mahara-contributors team mailing list archive

[Aaron Wells <1552439@xxxxxxxxxxxxxxxxxx>]

Public bug reported:

Sometimes when you do a git merge, conflict resolution diff elements can
slip through the cracks of your merge resolution and get commit. They
tend to look like this:

<<<<<<< HEAD
(code here)
||||||| parent of 95ef242... More fixes for @failed - getting the select2 ajax to run
(more code here)
=======
(yet more code here)
>>>>>>> 95ef242... More fixes for @failed - getting the select2 ajax to run

You might not have all three code blocks unless you've turned on the
three-way diff setting in Git. Our minaccept will usually notice these
when they're in a PHP file because they are syntax errors, but they
don't get detected if they're in other types of files. So we should just
have minaccept look for those sequences of seven of these characters: <,
>, |, or =. And if it finds that, it rejects the commit.

** Affects: mahara
     Importance: Medium
     Assignee: Aaron Wells (u-aaronw)
         Status: Confirmed

** Changed in: mahara
       Status: New => Confirmed

** Changed in: mahara
   Importance: Undecided => Medium

** Changed in: mahara
     Assignee: (unassigned) => Aaron Wells (u-aaronw)

-- 
You received this bug notification because you are a member of Mahara
Contributors, which is subscribed to Mahara.
Matching subscriptions: Subscription for all Mahara Contributors -- please ask on #mahara-dev or mahara.org forum before editing or unsubscribing it!
https://bugs.launchpad.net/bugs/1552439

Title:
  Add a minaccept to look for conflict remnants

Status in Mahara:
  Confirmed

Bug description:
  Sometimes when you do a git merge, conflict resolution diff elements
  can slip through the cracks of your merge resolution and get commit.
  They tend to look like this:

  <<<<<<< HEAD
  (code here)
  ||||||| parent of 95ef242... More fixes for @failed - getting the select2 ajax to run
  (more code here)
  =======
  (yet more code here)
  >>>>>>> 95ef242... More fixes for @failed - getting the select2 ajax to run

  You might not have all three code blocks unless you've turned on the
  three-way diff setting in Git. Our minaccept will usually notice these
  when they're in a PHP file because they are syntax errors, but they
  don't get detected if they're in other types of files. So we should
  just have minaccept look for those sequences of seven of these
  characters: <, >, |, or =. And if it finds that, it rejects the
  commit.

To manage notifications about this bug go to:
https://bugs.launchpad.net/mahara/+bug/1552439/+subscriptions