-
Notifications
You must be signed in to change notification settings - Fork 191
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
Fix code snippet in the CHANGELOG.rst file on master #906
Comments
I'm not sure that a separate commit is the way to approach this, the idea of git is that you can pull those changes from the other branch into the develop branch. I think having multiple commits doing the same thing across different branches is just going to cause conflicts when they eventually get merged no? |
Add missing closing backtick to code snippet in CHANGELOG.rst to satisfy #906
The Also, long story short (or TLDR), it doesn't seem to make a difference whether you cherry-pick commits or make manual commits. In the end, you're always making more commits and there will be "duplicates" either way when branches later get merged (see below). The good news is that there won't be conflicts as a result of duplicating identical content since that's stored only once by git. Since you had brought this topic up before, I had stopped doing changes that need to be done on more than one branch while I tried looking into it. I first asked in here on multiple occasions inside of discussions and issues. I then asked in Gitter. I didn't get information that I could use to make decisions with from any of those attempts. I did a bunch of searches online, but got wildly differing information all over the place, so I turned to the GitHub channel on IRC on multiple occasions and tried to get help with it, but nobody responded. Ever. I seriously think that that channel is a void or a black hole. If you have any secrets you've been carrying around that you'd like to unburden yourself of, that seems like the perfect place in which to do so. It then finally occurred to me to try the git channel on IRC. I asked this question and immediately got this response:
That caused a lively conversation in which they provided me with all kinds of solid resources to use. That caused me to go down a huge rabbit-hole afterwards and learn what I could about the details. It's possible I may not be properly understanding the information or that I was given unreliable information. Please look over my notes from that journey below and let me know if any of it is incorrect or needs more research or if anything is missing that should be there. I'm trying to put together as solid of a framework as possible so that I always know where the walls of my box are and I always appreciate any help I can get. My notes on commits and cherry-picking:
|
We are painfully aware of the problems, but do not understand how to fix it yet. |
AutoKey is a Xorg application and will not function in a Wayland session. Do you use Xorg (X11) or Wayland?
Xorg
Has this issue already been reported?
Is this a question rather than an issue?
What type of issue is this?
None
Choose one or more terms that describe this issue:
Other terms that describe this issue if not provided above:
No response
Which Linux distribution did you use?
No response
Which AutoKey GUI did you use?
None
Which AutoKey version did you use?
No response
How did you install AutoKey?
No response
Can you briefly describe the issue?
The
python3 setup.py test
code snippet is missing its closing backtick in line 113 of the CHANGELOG.rst file on the master branch. Note that this has been fixed on the beta and develop branches already.Can the issue be reproduced?
Always
What are the steps to reproduce the issue?
No response
What should have happened?
The snippet should have had a closing backtick.
What actually happened?
The closing backtick is missing.
Do you have screenshots?
No response
Can you provide the output of the AutoKey command?
No response
Anything else?
No response
The text was updated successfully, but these errors were encountered: