[platform-dev] New PULL request #1158

2024-01-29 Thread java joe via platform-dev

https://github.com/eclipse-platform/eclipse.platform/pull/1158
I think I fixed everything back to how it was.
Any comments greatly appreciated.
Thank you,,,
___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev


Re: [platform-dev] How to erase current fork and create new one

2024-01-29 Thread Christoph Läubrich via platform-dev

For general Q you might better use the discussions here:

https://github.com/eclipse-platform/.github/discussions

this question is only loosely related to platform development.


In general Git has the concept of remotes and you have a local copy, so 
YES this will destroy everything on your github account and make it as 
you have nothing changed.


That's how you you go:

0) make a backup of your local data (!)
1) create a new branch of your local changes e.g. name it BACKUP_ISSUE_xyz
2) push the branch to your fork, use the UI to check if all your 
valuable work is there!
3) change to the master branch in the UI and sync it with the forked 
repo so you are up to date.
4) now in your local copy change to the master and reset it to the state 
of the remote (don't push anything!)

5) create a new branch from master e.g. issue_xyz
6) now merge with squash option your local BACKUP_ISSUE_xyz branch or 
copy files from the backup in step (0)
7) commit and push the new branch and you should have a clean state now 
to start from again.


Am 29.01.24 um 11:32 schrieb java joe via platform-dev:

will I loose my bundles?


On 1/29/24 05:31, Christoph Läubrich via platform-dev wrote:

Your fork or your master branch?

1) always work on branches
2) if you open github UI there is a sync button:

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

if you chose to discard your commits you are up to date with the 
forked repo.


Am 29.01.24 um 11:26 schrieb java joe via platform-dev:

Trying to fix my fork that has a ton of commits
that were from my AWS account that has no email ( too expensive ).
So I tried rewriting all my commits
with a git filter to modify all the history, looked like it work
on my local branch, but not github

and I think now my fork has become
out of sync and Im unable to successfully do PR.

Can I delete the fork and pull a new one, then re-add my bundles?

ANY HELP GREATLY appreciated!

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev



___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev


Re: [platform-dev] How to erase current fork and create new one

2024-01-29 Thread java joe via platform-dev

will I loose my bundles?


On 1/29/24 05:31, Christoph Läubrich via platform-dev wrote:

Your fork or your master branch?

1) always work on branches
2) if you open github UI there is a sync button:

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork 



if you chose to discard your commits you are up to date with the 
forked repo.


Am 29.01.24 um 11:26 schrieb java joe via platform-dev:

Trying to fix my fork that has a ton of commits
that were from my AWS account that has no email ( too expensive ).
So I tried rewriting all my commits
with a git filter to modify all the history, looked like it work
on my local branch, but not github

and I think now my fork has become
out of sync and Im unable to successfully do PR.

Can I delete the fork and pull a new one, then re-add my bundles?

ANY HELP GREATLY appreciated!

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev
___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev


Re: [platform-dev] How to erase current fork and create new one

2024-01-29 Thread Christoph Läubrich via platform-dev

Your fork or your master branch?

1) always work on branches
2) if you open github UI there is a sync button:

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

if you chose to discard your commits you are up to date with the forked 
repo.


Am 29.01.24 um 11:26 schrieb java joe via platform-dev:

Trying to fix my fork that has a ton of commits
that were from my AWS account that has no email ( too expensive ).
So I tried rewriting all my commits
with a git filter to modify all the history, looked like it work
on my local branch, but not github

and I think now my fork has become
out of sync and Im unable to successfully do PR.

Can I delete the fork and pull a new one, then re-add my bundles?

ANY HELP GREATLY appreciated!

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev

___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev


Re: [platform-dev] How to erase current fork and create new one

2024-01-29 Thread Mickael Istria via platform-dev
Hi,
You can just delete all branches from your fork and create new ones.
___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev


[platform-dev] How to erase current fork and create new one

2024-01-29 Thread java joe via platform-dev

Trying to fix my fork that has a ton of commits
that were from my AWS account that has no email ( too expensive ).
So I tried rewriting all my commits
with a git filter to modify all the history, looked like it work
on my local branch, but not github

and I think now my fork has become
out of sync and Im unable to successfully do PR.

Can I delete the fork and pull a new one, then re-add my bundles?

ANY HELP GREATLY appreciated!___
platform-dev mailing list
platform-dev@eclipse.org
To unsubscribe from this list, visit 
https://www.eclipse.org/mailman/listinfo/platform-dev