? Failure

User tests: Successful: Unsuccessful:

avatar brianteeman
brianteeman
30 May 2017

This time its the correct files being removed
Positions was only used in hathor
Preview has not been used for a very long time

Thanks @wilsonge

avatar brianteeman brianteeman - open - 30 May 2017
avatar brianteeman brianteeman - change - 30 May 2017
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 30 May 2017
Category Administration com_modules
avatar tonypartridge
tonypartridge - comment - 4 Jun 2017

Please fix conflicts :-)

avatar brianteeman
brianteeman - comment - 4 Jun 2017

@tonypartridge I would if there were any

avatar brianteeman
brianteeman - comment - 4 Jun 2017

Oops sorry the mobile says no and the desktop says yes

avatar brianteeman brianteeman - change - 8 Jun 2017
Milestone Added:
avatar brianteeman brianteeman - change - 8 Jun 2017
Milestone Added:
avatar brianteeman
brianteeman - comment - 14 Jun 2017

i really dont see how a PR to remove a file can have conflicts or how the conflicts can be fixed - please advise @wilsonge

avatar mbabker
mbabker - comment - 14 Jun 2017

You probably can't fix this one through the GitHub UI on its own.

Even when you delete/rename files, git can still track those operations so it sees that you tried one change and someone else tried another change and it creates a conflict because it gets confused.

avatar brianteeman
brianteeman - comment - 14 Jun 2017

best to close and create a new pr?

avatar mbabker
mbabker - comment - 14 Jun 2017

Unless George wants to just manually merge this then yes.

avatar brianteeman
brianteeman - comment - 14 Jun 2017

@wilsonge please advise

avatar brianteeman brianteeman - change - 14 Jun 2017
Status Pending Closed
Closed_Date 0000-00-00 00:00:00 2017-06-14 19:53:40
Closed_By brianteeman
avatar brianteeman brianteeman - close - 14 Jun 2017
avatar wilsonge
wilsonge - comment - 14 Jun 2017

Sorry do it again. Will make sure it gets merged

Add a Comment

Login with GitHub to post a comment