Hi Folks, For those who don't want to read - there is a List of videos <https://www.youtube.com/watch?v=497hRzpRHuI&list=PLuiC_HFhI4OyUiDGqvzB64mTQTURABjlW> about
*Improve Community Communication proposal* 07 Use merge request, to contribute to governance -------------- Hi Folks, Pietsch Mario back with How can Users contribute to the Governance Model This is the second part, which is a little bit more developer centric. On the main page, I go to Community Info With the Community Info, if I'm logged in, I don't have write access at the moment. This is tiddlywiki.org: Senatus: Committee: Details Here I have the possibility to "fork the project" It copies everything, to my video account. I'm forking it to my repository, where I DO have write access As you can see, I'm here now Say "Profile". This is my lab-video profile. I have my personal projects There is the one, which is called "committee". I can rename it to my likings. That's not a problem. Let's say, I want to change something in the README file I go to the webIDE, which opens a full "file tree" I have the possibility to change several files at once or 1 by 1 per merge request. Let's start simple, just add 2 new-lines at the end. Then you can see. It says "unstaged modifications". This is a "permanent" save, so you don't need to take care, so that it's not saved. I could open a new one. You can see, there is a "tabbed view" I could create 2 changes. I also can say: create a "New file" or create a "New directory" .. or what ever There is 1 important point: Keep it simple! If you want to change some typos, just go there and change 1 or 2 files. Then it's easy to be merged. If you change _all_ of them, there there will be a big discussion and it will probably never be merged. So go 1 by 1 and it will be easy. I'll show you how. There is the "review" button, which gives you the difference between the 2 elements. This is the old one and this is the new one. There is the README This is the "review stage" Then there is the "commit" element Here I can say. It makes sense, that readme is 1 merge request and "guidelines" is a new one .. or If you want, you can have them both, so "stage all" I'll show you 1 by 1 This is now README Then you say: "commit". A commit message: I need 2 more new lines. Which will probably be _not_ merged. You can say: "Create a new branch". It gives you a default name You can give it a different one, or just use this one. You can create a new branch and then commit it. or if we say: I want to have both (files). Change everything, then I can say: Create a new branch and a "merge request" Otherwise it will be 2 steps. I want everything, so "create a new branch" and directly create a new "merge request" Say: commit ... OK Then it opens this page, where it says: "I need 2 more new lines" It takes this as the title of the new "merge request" Then ... some info about: why ... and so on. So developers know, why you want to have this. This is the "feature branch" and it should be merged into the "master branch" "Submit merge request". OK Now we are back at tiddlywiki.org: senatus: and the Merge Request So there is the new "merge request" Now the developers from the "committee" can discuss the merge request If everything is OK they get a button and can merge it. 2 ways to contribute 1st - User way: Create an issue and the developers will do the rest. or If you want to save some time for the developers and you want to be sure .. or Let's say, the chance is higher that something is merged, then directly crate a "merge request". Why is the chance higher? Simply because it is less work for the developers That's it! OK Now, we will use this "merge request" for Consensus Seeking in the next video. See you soon! -- You received this message because you are subscribed to the Google Groups "TiddlyWiki" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tiddlywiki/64691e08-c547-44ad-8673-ee7de6149153o%40googlegroups.com.
