@smanzi thanks for realizing and fixing it (blush).

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.

@test Tested with success as done with original PR #5291 .

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.

@smanzi Well, testing was not necessary but maybe useful for statistics ;-) Question: Shall I close by PR #5291 now as you opened this one? If yes, I could close it and then delete my repository (because no other things in progrss there) and create one again (new clean start), and in future I will always use own branches and not the staging for doing things on my repo.

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.

@smanzi Ahh, PR #5291 was already merged, I forgot .. so forget my question about closing it. But can you advice: Should I delete my repo now and make a new one for a clean start?

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.

@richard67

If you have no other PR pending, yes, you can delete your repo and re-fork, but actually there is no need for that (even if your staging branch is dirty). Let me explain you what to to:

• if you haven't already done that, install "GitHub for Windows"
• once installed and you have cloned your remote repo on your PC, select it (in GitHub for Window) and select branch 'staging'
• in the left side right click on the repo name and select "Open in GitShell"
• in GitShell issue the following commands:

git checkout staging
git remote update
git reset --hard upstream/staging
git push origin +staging

• et voilà! You have a clean staging (both local and remote) aligned with the current state: any modification you did to your staging copy are reset and lost
• from now on remember to create a new branch for each PR you want to submit
• no need to sync then your branch with upstream/staging, unless some of the files you were editing have been modified in joomla/joomla-cms/staging too. In case you need to do a merge and not a "reset --hard" (in the branch you were editing, I mean...)

for the above list of command I've actually added an alias in my local .gitconfig file:

[alias]
    resetstaging = !git checkout staging && git remote update && git reset --hard upstream/staging && git push origin +staging

then in GitShell I can simply use git resetstaging

Hope this can be helpful...

@smanzi Very helpful. Thanks a lot.

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.

moving to RTC since the same code was tested here by three @brianteeman, @dgt41, @smanzi and here by @richard67 Thanks to all!

This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/5328.