GitHub pull requests

[jeeswg]

Hello. Say someone submitted a GitHub pull request to you, and you liked it, apart from one typo in a comment. Is it easy to correct that typo and accept the pull request, or does it become an entirely new pull request, or does it become a two-part pull request, or what. Thanks.

Links:
[AHK v1.1/v2.0 pull requests]
Pull Requests · Lexikos/AutoHotkey_L · GitHub
https://github.com/Lexikos/AutoHotkey_L/pulls
[AHK v1.1 commits]
Commits · Lexikos/AutoHotkey_L · GitHub
https://github.com/Lexikos/AutoHotkey_L/commits/master
[AHK v2.0 commits]
Commits · Lexikos/AutoHotkey_L · GitHub
https://github.com/Lexikos/AutoHotkey_L/commits/alpha

[Guest]

You can ask if they would like to correct it, pull requests can be edited, so no need to create a new one.

Or if you don't mind doing it yourself, pull it locally first, edit it, merge it and push it back to GitHub (your edit will be visible in the commit history of course)

[jeeswg]

Thanks a lot for your answer. A lot of the best posts come from Guests.

[guest3456]

Hello. Say someone submitted a GitHub pull request to you, and you liked it, apart from one typo in a comment. Is it easy to correct that typo and accept the pull request, or does it become an entirely new pull request, or does it become a two-part pull request, or what. Thanks.

pull requests initiate from a branch from one repository, and request to be merged into a branch of another repository

typically the workflow is like this:

1. the main repo exists in Lexikos/AHK_L in its MASTER branch
2. you fork (copy) the repo into your own account at jeeswg/AHK_L
3. you create a new branch in your own repo with some changes you want to make, say a bugfix in branch BUGFIX1
4. you add some changes in your BUGFIX1 branch so you don't affect your main branch
5. you then create a pull request to merge your changes from the BUGFIX1 branch in your repo into the MASTER branch in the main repo

now, these web based git services such as github or gitlab will track your branch in their web UI, so it will update the PR automatically whenever you add new commits to your BUGFIX1 branch. so yes, you can just edit your typo without needing to create a whole new PR

example:

https://github.com/Lexikos/AutoHotkey_L/pull/27

1. at the top of that link, you can see fincs has created a new branch named "v2-onexit-onclipboardchange" and he wanted to merge it into the "alpha" branch in Lexikos repo (Lexikos uses the "alpha" name to represent the v2 branch)
2. fincs writes a post with a description of his proposed changes
3. underneath that, you can see github tracks 3 commits that fincs had added to his onexit branch. these were his changes and updates
4. Lexikos and joedf comment on the proposed request. Lexikos prefers a certain code style for the {braces} and asks that it be changed
5. github tracks 2 more commits that fincs makes to his "v2-onexit-onclipboardchange" branch
- the first commit, fincs merges the upstream 'alpha' branch back into his onexit feature branch. this is because he originally created the PR in april. Lexikos didn't comment until June, and presumably the v2 alpha branch had added more updates since then, so fincs wanted to clean up his PR so that his branch would match the latest stable copy of Lexikos' repo
- the second commit, fincs makes the code formatting change as Lexikos previously requested
6. a few more comments, then Lexikos is finally happy and merges

you may also want to read up on the philosophy behind this version control systems like git, and start playing around locally. but i didn't fully start grasping it until i actually started using it

OffTopic:
theres no problem with you not understanding this and trying to learn. that's good. but, in the other thread, you were all critical of github and pullrequests and how all the development and discussion was taking place "behind your back" so to speak. the point i'm trying to make is, when you don't even understand something, you are not in the place to be making claims or demands about when and where discussion should be taking place. you should be coming from an open mindset of "hey i notice some development is going on over at github, what is all that about?" (like the mindset you've taken with this thread), rather than the mindset of "i dont like this so it shouldn't be done this way"

[jeeswg]

- Thanks for the info.
- Great link re. source code style, thanks.

offtopic

- Re. OT:

theres no problem with you not understanding this and trying to learn. that's good.

- Somewhat patronising.

but, in the other thread, you were all critical of github and pullrequests

- The use of 'you were all' is somewhat childish/disrespectful. If you are/were still in high school however, I might be more understanding.

and how all the development and discussion was taking place "behind your back" so to speak.

- *I* knew what was taking place.
- AHK forum members are more likely to check the AHK forums regularly than the GitHub pull request section. Yes or no?
- Does it matter? Yes or no?
- Are the AHK forums better suited to discussions and finding/formatting/editing posts. Yes or no?
- You started a thread complaining about the speed of AHK v2 development. If things are discussed on GitHub, implemented, then re-discussed when announced on the AHK forums, then immediately un-implemented, then re-discussed, and re-implemented in a different way, it takes longer.

the point i'm trying to make is, when you don't even understand something, you are not in the place to be making claims or demands about when and where discussion should be taking place.

- Again being as disrespectful as possible, although subtly, so that people who are not the main recipient of the message might not find it so immediately distasteful.
- You should respect me and others enough to know that, while we don't claim to know everything about a subject, we research it to a certain extent. The points you have made about GitHub in this thread coincide precisely with what I already knew.
- Is it not obvious to you, that the point of whether things are primarily discussed on the AHK forums or on the GitHub forums has precisely nothing to do with the specifics of how GitHub works.

you should be coming from an open mindset of "hey i notice some development is going on over at github, what is all that about?" (like the mindset you've taken with this thread), rather than the mindset of "i dont like this so it shouldn't be done this way"

- OK, a point that is almost reasonable, if a little patronising.
- The main problem with it is this. My post did come with an open mindset. You either interpreted a tone in it that wasn't there, or chose to. And what's more, let's assume that your interpretation was right, your approach was wrong.
- If I see a tone in someone's post that I don't like, I respond according to the best possible interpretation of that post. I focus on anything valid or valuable in the post, and answer in response to the facts. I also try not to answer in a way that will antagonise the person, and I try to not cause further friction.
- If a post is very new, I might give them some time to reflect on it, to possibly tone it down a bit. I also deliberately do not quote such posts, because this gives them a chance to amend it. I might message them privately if I felt that by changing their message they might avoid some friction.
- Unlike you I do not immediately quote the post and start going on the offensive.
- If I see an argument is going on, I don't take one side, but I try to give both people maximum credit.
- Your approach to posts seems to be this: 'As long as I don't swear, it's OK.'
- You are regularly openly or subtly disrespectful and confrontational towards people in a way that you must know is unhelpful.
- Also, you childishly use phrases like 'lol' and other such constructions. While at the same time appearing to believe that you can talk down to other people, as if they are a child. A bizarre contradiction.
- I don't mind people that only write in lower case or miss out punctuation marks, but it doesn't help during serious conversations, where you are criticising other people.
- It also doesn't help to spam a potentially useful thread 8 times, and insist that you are entitled to do so.
- At present, you are in a very poor position to criticise anyone else.
- The main point is that if people give other people the benefit of the doubt, this leads to less friction and more productive conversations.
- I hope that this post will give you pause for thought. At the moment, past and present on this forum, I count only 2 people whose posts I deem to be regularly unacceptable, and a 3rd person who is just a little misguided in misreading posts.
- Perhaps you'll try and turn all of this around onto me. But that would just amplify the impression that you tend to make things personal. I had no intention to reprimand you here, but it's the third thread, and tenth post in recent weeks where you have gone offtopic on one of my threads, making petty criticisms of me.
- The measure of you will be seen if in your response to me, you would seek to find a parting comment that wouldn't antagonise me, and that would leave everything in a peaceful state that all could be happy with. Or contrarily would your response give the appearance of wanting to turn yet another perfectly acceptable perfectly viable thread into a free-for-all. Also, if you did decide to write a long offtopic response, would you have the courtesy to use a spoiler like I have done.
- The AutoHotkey forums are famed for their friendly ethos. The 2 people I mentioned earlier go against that trend. It's better to just ignore what you'd like to say, and just try to be nice.

[nnnik]

After a feature has been added in code its extremely unlikely to ever get removed. Regardless of whether it was added by an accepted pull request or made by lexikos. No amount of discussion on this forums are likely to change that.

[jeeswg]

- Thank you nnnik, interesting point. Although in the AHK v2 alpha stage, there have been some things that have gone back and forth like: more use of %% to dereference, then less, making commands have a return parameter, then not, and, LoopXXX as well as Loop XXX, then not. At least those three things that I can think of.
- If 'things once changed remain fixed' is a truism, more reason to have all the big discussions early and in one place.

[nnnik]

Those were not things added in Pull Requests or? And if we should have a discussion in the right place it would be github the home of the AutoHotkey source.

[jeeswg]

Those were not things added in Pull Requests or?

- Here's a GitHub pull request being retrospectively discussed on the AHK forums.
<> no longer acceptable as a comparison operator - AutoHotkey Community
https://autohotkey.com/boards/viewtopic ... 37&t=55460
- Am I surprised? No.
- If certain pull requests would have significant ramifications, it would be wise to introduce those ideas at the AHK forums first.

And if we should have a discussion in the right place it would be github the home of the AutoHotkey source.

- Is GitHub the right place though?
- The AutoHotkey forums are better for feature and source code discussions, they are the right place. E.g. you can only discuss *one* pull request per GitHub pull request thread, you can't consider the larger picture.
- It all gets discussed here eventually anyway, just that now we have important points scattered in more places.
- I see GitHub as useful for tracking source code changes, that's it. There can still be more minor pull request discussions there for convenience.