Pending

User tests: Successful: Unsuccessful:

avatar elinw elinw - open - 3 Mar 2013
avatar mbabker
mbabker - comment - 8 Mar 2013

How are you merging in updates? If you aren't using at least git merge <joomla> master (where <joomla> is the name of the remote for this repo in your local setup), then these PRs will continue to look like you're reintroducing already committed code. Looking at elinw/joomla-cms@7ddb055 it does not look like a merge commit.

avatar elinw
elinw - comment - 8 Mar 2013

The way the pr looks has no impact on what happens when you merge. When
there are a lot of conflicts because the pr is older or system wide changes
this is what you get because of having to merge conflicts.

On Thu, Mar 7, 2013 at 8:25 PM, Michael Babker notifications@github.comwrote:

How are you merging in updates? If you aren't using at least git merge
master (where is the name of the remote for this repo
in your local setup), then these PRs will continue to look like you're
reintroducing already committed code. Looking at elinw/joomla-cms@7ddb055elinw@7ddb055it does not look like a merge commit.


Reply to this email directly or view it on GitHub#749 (comment)
.

avatar nicksavov
nicksavov - comment - 23 Mar 2013

Thanks for coding this, Elin! Looks like this is resolved with #814 .

Closing.

avatar nicksavov nicksavov - close - 23 Mar 2013

Add a Comment

Login with GitHub to post a comment