Closed sudwhiwdh closed 5 months ago
@deeplow I understand about the separate development branch, yes. And not yet what it needs right now.
I'm using the GitHub web interface. So I do not know what to do with the git commands yet.
What customisations do you want to make? Would that also work in a subsequent PR you open? Or can't you add this to the main branch of my fork with the appropriate authorisations? Of course, I could also close this PR and open a new branch and then resubmit it as a PR.
Or can't you add this to the main branch of my fork with the appropriate authorisations?
Sorry for the confusion. Yes, all I needed was confirmation that I could push to your main branch.
I was afraid I could mess something up as well, which I just did. I accidentally force-pushed our main branch onto yours with git push sudwhiwdh main
(don't worry, I still have your changes) instead git push sudwhiwdh HEAD:main
. Worse -- github must have interpreted that as closing the issue since it now has 0 commits (I didn't do it though the web UI) and it no longer allows me to force-push to your main branch to fix the issue. Sorry about that.
I have opened https://github.com/freedomofpress/dangerzone/pull/683 to replace this. The only changes I made were:
Thanks for the typo fixes! I'm just going to do a minor change to the commit titles but I see that you pushed on you main branch. Then pushing the amended changes may break your main branch if you ever try to push it again. On the
main
branch you'll need to dogit reset --hard HEAD^^
(this will remove your two commits) and thengit pull
. I hope that's OK.To avoid this in the future feel free to create a feature branch (github instructions, git instructions).