? Pending

User tests: Successful: Unsuccessful:

avatar N6REJ
N6REJ
1 Nov 2020

Pull Request for Issue # .

Summary of Changes

Reverts incorrectly changed files from #30778

Testing Instructions

test per #30778

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

avatar N6REJ N6REJ - open - 1 Nov 2020
avatar N6REJ N6REJ - change - 1 Nov 2020
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 1 Nov 2020
Category Repository Administration
avatar N6REJ N6REJ - change - 1 Nov 2020
Labels Added: ?
avatar joomla-cms-bot joomla-cms-bot - change - 1 Nov 2020
Category Repository Administration Repository
avatar zero-24
zero-24 - comment - 1 Nov 2020

Mergeing that whitespace only fix in the readme now by review thanks @N6REJ

avatar zero-24 zero-24 - change - 1 Nov 2020
Status Pending Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2020-11-01 22:58:02
Closed_By zero-24
avatar zero-24 zero-24 - close - 1 Nov 2020
avatar zero-24 zero-24 - merge - 1 Nov 2020
avatar brianteeman
brianteeman - comment - 1 Nov 2020

the title of this pr and commit has no relevance to the changes

avatar N6REJ
N6REJ - comment - 1 Nov 2020

go away @brianteeman you clearly can't read logs

avatar zero-24
zero-24 - comment - 1 Nov 2020

Please do not attack each other personally here. This PR here fixed an whitespace issue and i might should have choosen an better commit message, right. When there are personal differences please clear them offline and not at the tracker. Thanks!

avatar N6REJ
N6REJ - comment - 1 Nov 2020

@zero-24 please check #31296, its related

avatar zero-24
zero-24 - comment - 1 Nov 2020

@zero-24 please check #31296, its related

Im not sure where that is realted? That an empty PR with 0 files changed? Maybe a commit was missing?

avatar brianteeman
brianteeman - comment - 1 Nov 2020

@N6REJ before attacking you need to look here on github to see what your PR are. Your local branches are clearly messed up.

avatar brianteeman
brianteeman - comment - 1 Nov 2020

@zero-24 nothing personal. Was just pointing out that the commit message has no relevance to a whitespace change. The git commit log has value and should have relevant messages. However it is clear from @N6REJ comments and subsequent PR that he was expecting this PR to do more than a simple white space change

avatar N6REJ
N6REJ - comment - 1 Nov 2020

@zero-24 ok i'm totally confused... when checking my "git log" for things that changed from todays pull from staging it blamed #30778 for 3 files being deleted and 1 file being added. When I told git to revert that it happily did so but I didn't realize it wouldn't "add" those files back to git which is why they didn't show up the first time.
Now when I check the log it shows they are infact back now.
image

avatar brianteeman
brianteeman - comment - 1 Nov 2020

It really is much easier if you always create branches from joomla-cms and not from a local fork and that you always create a new branch for every pr

avatar N6REJ
N6REJ - comment - 1 Nov 2020

It really is much easier if you always create branches from joomla-cms and not from a local fork and that you always create a new branch for every pr

thats my general practice..

  1. make sure current local branch is staging
  2. pull from joomla staging
  3. push to n6rej/staging
  4. create new branch
  5. make changes & commit > push to new branch.
  6. create pr
  7. switch back to staging

Something wrong with that method?

for updating/syncing the process is almost identical

  1. make sure I'm on staging
  2. pull from joomla->staging
  3. push to n6rej/staging.
  4. switch to my local pr branch
  5. pull from joomla->staging
  6. push to my remote pr branch
  7. switch back to staging
avatar brianteeman
brianteeman - comment - 2 Nov 2020

Are you doing this at the command line or with some software. You seem to be working with multiple staging ??
Highly recommend using smartgit. Recording below

git

avatar N6REJ
N6REJ - comment - 3 Nov 2020

I use git in phpstorm mostly.

Add a Comment

Login with GitHub to post a comment