Nostr Web Client

Asking this a bit late, but could someone who is familiar with GitHub advise?

I tried creating a pull request for Damus (my first PR anywhere ever) for haptic/long-press zap amount customizations.

Then I submitted it.

It now shows a message that I am asking to merge 264 commits. Not intended, obviously… and hoping it doesn’t mess with other users’ more proficient submissions.

Am I doing this right 🙏

boston wine 2y ago

Halp did I break Damus

@jb55 I’m sorry

#[0]

Reply to this note

Please Login to reply.

Discussion

𝚂𝚚𝚟𝚊𝚣𝚗𝚢𝚊𝚔 2y ago

Dw your PR is separate and won’t break anything. Worst case, it will be closed.

How did you submit your changes?

boston wine 2y ago

Thanks for the reply 🙏

I clicked “create PR” then selected a branch (“zaps”) and after I entered a title and description clicked “submit”

This one

https://github.com/damus-io/damus/pull/668

𝚂𝚚𝚟𝚊𝚣𝚗𝚢𝚊𝚔 2y ago

I would close that PR and try again. Maybe this video can help you.

https://m.youtube.com/watch?v=8A4TsoXJOs8

boston wine 2y ago

Hey thanks for the guidance. Closed (and someone shared a comparable PR) and will watch the vid. Pura vida 🙏🤙

yunginter.net 2y ago

I’m fairly new to git hub, and messed up up PR similarly. it looks like you *requested* to merge the master branch into damus-io’s zaps branch…

what you want to do is first fork the master branch which will make it your repository Boston-wine/damus

then you want to make a new branch in your version of the repo, so when you submit different pr’s you are only submitting one change at a time (one branch at a time)

then when you go to submit back on the damus-io repo, you want to hit “compare across across forks select your repo as the head repository and then select the branch for that specific change as compare

boston wine 2y ago

Thank you!! 🙏

I still have much to learn but it feels good to dive in 🤙