[#414] - Add diff view for changed titles and description texts
- Closed
- 15 Aug 2014
- Medium
- Build: master
- # 414
- Diff
- joomla:diff
- Success continuous-integration/travis-ci The Travis CI build passed Details
User tests: Successful: Unsuccessful:
This will add a diff algorithm in PHP and use it to render differences in titles and description texts.
Example:
This is similar to what GitHub does:
Fix #413
| Title |
|
||||||
| Labels |
Added:
enhancement
|
||||||
| Status | New | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2014-08-15 05:44:56 |
Hmm about this, composer.lock file was also changed after I use composer update, but I didn’t fetch any changes of composer.lock from the master branch, so I have to ignore the change . Is that expected?
--
Allen Zhao
Sent with Airmail
On August 15, 2014 at 1:48:38 PM, Dmitry Rekun (notifications@github.com) wrote:
Note to @mbabker - composer.json was changed.
—
Reply to this email directly or view it on GitHub.
Hmm about this, composer.lock file
Yes this is one problem...
Usually when working with multiple branches, each of them containing changes to composer files, you get pretty ugly merge conflicts.
So I personally avoid to commit changes to the composer.lock file to the repo (unless this is required).
After the changes are committed to the master branch, the composer.lock file should be updated of course.
Not sure if this is a common practice, also we don't have any agreement on this for the JTracker project (AFAIK)
After the changes are committed to the master branch, the composer.lock file should be updated of course.
That's how it should be.
Note to @mbabker -
composer.jsonwas changed.