Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add diff view for changed titles and description texts #414

Merged
merged 7 commits into from
Aug 15, 2014
Merged

Add diff view for changed titles and description texts #414

merged 7 commits into from
Aug 15, 2014

Conversation

elkuku
Copy link
Contributor

@elkuku elkuku commented Aug 12, 2014

This will add a diff algorithm in PHP and use it to render differences in titles and description texts.

Example:

debug-3874

This is similar to what GitHub does:

debug-3875

Fix #413

@elkuku elkuku changed the title Add diff view for changed titles and description texts - Ref #413 Add diff view for changed titles and description texts - Fix #413 Aug 14, 2014
b2z added a commit that referenced this pull request Aug 15, 2014
Add diff view for changed titles and description texts - Fix #413
@b2z b2z merged commit c5b3e42 into master Aug 15, 2014
@b2z b2z deleted the diff branch August 15, 2014 05:44
@b2z
Copy link
Member

b2z commented Aug 15, 2014

Note to @mbabker - composer.json was changed.

@allenzhao
Copy link
Contributor

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.

@elkuku elkuku changed the title Add diff view for changed titles and description texts - Fix #413 Add diff view for changed titles and description texts Aug 16, 2014
@elkuku
Copy link
Contributor Author

elkuku commented Aug 16, 2014

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)

@b2z
Copy link
Member

b2z commented Aug 18, 2014

After the changes are committed to the master branch, the composer.lock file should be updated of course.

That's how it should be.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Information doesn't fit in the DIV
3 participants