Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add detailed git usage instruction to the Watchface Creation Guide #172

Open
eLtMosen opened this issue Jul 25, 2022 · 0 comments
Open

Add detailed git usage instruction to the Watchface Creation Guide #172

eLtMosen opened this issue Jul 25, 2022 · 0 comments

Comments

@eLtMosen
Copy link
Member

Following a discussion on matrix, saving the log here to salvage from:

Now, HOW TO PR:
You sure have cloned the Asteroid unofficial repo already, you can not directly pull request to that for security and ease of review reasons.

Fork the repo on the github web page, this will make a forked repo available under your personal github account.
Clone this personal fork with git clone https://unofficial-watchfaces
Now cd into this folder and set a remote so you can push to your repo from your local machine git remote set-url origin [email protected]:/unofficial-watchfaces.git
Create a branch for your changes (=New addition) git checkout -b analog-brawnish
This command also checks you out from master to the new branch, so your changes will not affect the master branch and you can always fetch changes from upstream to your fork.
Now copy your watchface to the other ones with the same folder and file structure.
git add analog-brawnish/ will add all new files and changes so you can commit them.
git commit -m "Add analog-brawnish " commits the added state so you can push to this commit your repo.
git push origin analog-brawnish will create the analog brawnish branch in your online repo from where you can pull request to AsteroidOS repos.
git checkout master will bring you back to the local master branch. Mind that your changes are not available in this master branch and it looks like the files are deleted. But those will "reappear when chekcing out between branches. Now you would be set to create another wathface branch from master, which is independed from analog-brawnish. Which makes it possible to have two pull requests open from the same fork, but different branches.
Now Pull request from the git website
Select the repo from your account, select the analog-brawnish branch from the tiny branch selector top-left.
Finally, hit "contribute" to open the Pull request dialog. Add a descripton, mind that the Header/Topic suggests what will happen when accepting your pull request. Like "Add watchface X /Change XY /Optimise X/". That way it will help to make the commit list easy to understand when browsing through later.
RE "git add analog-brawnish/ will add all new files and changes so you can commit them."
You will also need to add the ./thumbnails and README.md. Just Tabcomplpete your way through after git add. Tab completion will offer all remaing addable changes in the branch.
beroset
Good writeup! If that isn't already part of the "creating watchfaces" write up, perhaps it should be?
eLtMosen
My thoughts while writing 😅😬
But from scratch, git init, key login and such are missing. I did all that initial setup long ago and just copy my .git folder between machines 😅
beroset
For that, you can point to github's instructions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant