Godot to Github Setup, and how to use it!

what's up everybody ax wizard here gonna do a a rundown on how to set up Version Control with Godot and we're going to be using GitHub for our online repository so what this is going to let you do is that if you're just a solo uh developer like myself this will allow you to store your code like in the cloud so if I go to my GitHub account here you can see I've got my my game here and I have all of my code and our assets here and if I need to say if my computer dies or it gets you know flood or stolen or whatever happens to it and I lost all my stuff well it the pro the whole project is up here on GitHub and farther along if you actually get to a part uh where you are you know releasing your game and depending on what type of game you're making maybe it's a you know a live service game or something like that that requires uh you know people to download updates and stuff like that for it this uh this also allows you to keep track of changes you've made to your code so if for some reason you release an update that has a bug and you can go through and find where that that was and you can roll back to a previous commit and you can roll back to a previous stable build so there's there's lots of things with Version Control there's lots of uh nuances with it I'm I'm just going to go into simple stuff so if you are just a solo developer just wanting to put your code on the cloud so you can keep it safe I recommend doing this process and uh at on the later half of the video I'll go into some things you can do if you are not the only developer working on a project but yeah so let's get into it let's look at the documentation so what is Version Control Version Control allows you to you know control the versions it allows you to sort of change management and allows you to track what changes you make to your project and the most popular version of Version Control is this system called git it's git git and the popular online repository that everyone uses is GitHub even uh Godot uses GitHub so if you make an account with GitHub it's free um so I already made my account when you go to make your account it'll just ask you you know what do you want to use for your username so since I'm my channel is ax wizard beards games guitars I made my username ax wizard BGG so I made that username It'll ask you to put in your email and then you know you'll type in your you'll you'll set up a password for it just like any other uh account creation they're gonna send you a code to your email that you're going to have to enter in on the screen and then after that you're good to go so again GitHub is completely free does it cost you anything you can store all your code on there and you can make your repository private so since I right now we're looking at my game neurality 3092 that I'm working on I have a whole devlog series on it I want to be private because I don't want people to be able to just steal my code off the internet so I made it a private repository if you're working on a public project that maybe you want to work with other people on you know you can make it a public repository maybe you're making a helpful tool for the community or something like that but for me because I'm working on a game that I want to release as a full game one day I want to actually you know monetize it in a way I charge like an upfront cost I'm thinking like five bucks or something like that I want to make a little bit of money on it I don't want people to just steal it if they want to steal my code they better at least watch my damn devlog Series so I get some watch hours out of it but uh yeah so private repository and when you go to set up your GitHub account I think it asks you it tries to like get you to pay for it but you just choose the free option and you'll be fine so once you've got your GitHub account created and let's go into setting up Version Control in uh Godot so this process is going to work regardless of what version of Godot you're using so if you're still using one of the old 3.x versions of Godot like I am you haven't switched to the new 4.0 uh Godot that just released not too long ago is it'll still work if you're using the new Godot if you're using a Godot 4. this is still going to work as well so let's talk about what their documentation is so they have a built-in thing where you can set up Version Control in uh um agado before we get into that though they have this helpful stuff here so this official git plugin and if you have a newer version of Godot it's going to do a lot more for you even if you have an older version of Godot I think 3.2 is the earliest that they started supporting it with a a plug-in you're still going to be able to get some use out of it so they have this handy thing here that says if you're using uh get from inside the editor uh supported with an official plug-in you can find latest releases here and then documentation on how the git plugin can be used can be found here so this is really handy because this will take you to this page here you'll notice that hey we're back on GitHub this is the Godot engine Godot get plug-in repository and you can see that this is public so we can access it so this uh this this says uh gives you instructions basically you want to pick the instruction manual depending on your Godot version so if you're not sure how to check what version of Godot you have the easiest way is whenever you start Godot it always opens up like a command prompt in the back and if you look here you can see that I am on version 3.4.4 I just haven't updated Godot in a while and I'll probably update it when I finish my game I don't really want to have any potential breaking changes from doing a engine update that I'll have to go through and fix all my code and stuff like that for so I'm just I'm happy with where it's at right now I'm just going to stick with it so that's what I'm doing right now so for me 3.4 if you look here I have to use this git plug-in version one if you're using 3.5 or 3.6 you'll have to use version 2. if you're using a Godot version 4 you'll have to use version three now these are all fairly similar as far as the setup process so I've looked through all of these so if we go to the git plugin V1 Wiki here it has a lot of the the same instructions it's just that with every version of the plug-in they add more features within the plugin that you can use so what I'm going to do is I'm going to show you in addition to setting it up I'm going to show you how to use the command line so you can bypass that if for some reason the plugin is not working you can still use git commands to actually push your code so I'll go through a simple workflow if you're a solo developer and I'll also go through a a workflow if you're working with other developers on a project that you're collaborating on so it says uh so first thing is first you gotta install the git so you you install that here it even gives you a link if we open this in a new tab you can see it just gives us a standard website it'll detect like what version you want so you're on so it detects the I'm on windows so just download the the latest release I've already done this but I did take screenshots of the uh the actual install process so let me pull those up so when you do the uh get installer um it's going to ask you like where you want to save it uh just use the uh default directory next it's going to ask you what do you want to use for your default editor so in the event that git needs you to edit a file or something like that on the fly or maybe like edit a config file you get to specify what editor you want to use now by default get a git likes to use Vim I I hate Vim if you've never used Vim before you're lucky it's uh it's pretty atrocious some people swear by it I think it's just alien to me so I don't like it so I have notepad plus plus installed you can even just pick the normal notepad if you're on if you're on Windows just pick whatever text editor you prefer and then just hit next next it's going to ask you for the uh name of the initial branch in new repository so historically with uh get the the main branch was called Master it was the the master Branch but you know over the years people have gotten uh wised up to the negative connotations of that word and the developer Community as a whole is transitioning from using Master to main which actually makes more sense anyway so this just gives you a option to let git decide so currently it's still set to master but it sounds like they're gonna intend to change this to Maine in the future or you can just override it now and just call it main this is not a big deal I just chose to override and then it just defaulted to main so I would choose that option but if you want to if you want to let git decide you can do that as well just if you choose this option know that anytime I say main I would be referring to master if you uh chose this option but just for ease of use I would pick this second option here it will make your life easier so next it's going to ask what do you want to do as far as adjusting your path environment so if you were just using git from the little command prompt it provides only you would choose the first option I highly recommend choosing the second option which is the the recommended option because what this is going to do is this is going to set a path environment variable on your system that will allow third-party software such as the Godot plug-in to access git and so just choose that metal option and you'll be fine next it's going to ask you to choose the sh SSH executable just use the bundled one unless you know what you're doing and you already have some other external SSH exe that you prefer to use then choose the other one but if you're not even sure what this even is you don't really need to be just choose the default top option this is next is going to ask you what do you want to do for your https transport backend I just picked use the open SSL Library it was the the default choice you can also choose to use the native Windows secure Channel library but I don't I don't need to leverage any of those things so I just choose the top one next it's going to ask you to configure your line endings so this installer defaults to the top option but I recommend choosing the second option because if we go back to the documentation here there's this working with Git on Windows section here so I'm using Windows if you're watching this you might be using Windows it might be a slightly different process for if you're using Linux or Mac but for this they want us to set this core dot Auto crlf they want us to change it from True to input so if you look at the installer here this is what this second option is doing for us so we can actually knock out two birds with one stone here if we just check this second option so core.auto crl uh crlf is set to input which is what we want according to their documentation so choose that middle option and you'll be fine next it's going to ask you what terminal emulator you want to use with Git bash I just chose the uh the the the default top option the use Min TTY you can use the default Windows console window if you want but it doesn't really matter so just pick your preference I prefer to use the Min TTY forget it's just because it comes with it why not next it's going to ask you the default behavior of git pull unless you know what you're doing just leave it at default unless you have a specific reason for your setup that you need to choose rebase or only ever fast forward just leave it at default if you if you know what rebase and only fast forward does you probably don't even need this video so just leave it at default next is going to ask you to choose a credential helper I just picked git credential manager it's what was defaulted there you could choose to not use one I don't know exactly what that does behind the scenes I never looked into it anytime I've always installed git I've always just been told to use the get credential manager so that's that that's what I do so next it's going to ask you to configure some extra options this comes default with the top option checked enable file system caching I just left it that way I don't think I needed anything with to do with symbolic links so I just left that unchecked and then I just hit next next it's going to ask you about enabling experimental support I don't really want experimental stuff in my version control that sounds dangerous so I just left both of those unchecked which they were default anyway so they were defaulted to be unchecked so I just left it then I hit install and it goes through the install process and then when you're done uh you can you can hit finish you can launch git bash if you like we'll have to do that in a second or two but yeah so just just hit finish and then you're you you have git installed so now that we have git installed you have to configure your username and email in git so what you have to do is you have to enter these into a uh the the terminal so the easiest way to do that is if you don't have the terminal open already you can just go to your search bar and just type in git git and use git bash and this will bring open a little tiny uh command prompt for you and what you can do is you can just type in that so whatever you used for GitHub you want to use here so when it says username you want for for me mine was ax wizard BGG and then for email you'll want to use whatever email you use for that so if we do get config if I can type today that'd be fantastic you can also copy and paste if you want to user.name and the username is in quotes so I can do X wizard BGG and that'll set it and then you also do the same for your email it's just that the the email will not be in quotations so once you've got that set you can close this window here now it's going to have you install the plugin from the Godot asset Library so what they do is uh they they bring you to this uh download latest releases which is going to take you to this uh releases page and again you're going to want to pick the version that you need godot's version 3.4 to 3 dot uh or 3.2 to 3.4 you're gonna You're Gonna Want the latest version of version one if you're using 3.5 or 3.6 for for Godot You're Gonna Want version two of this plugin if you're using Godot version 4 you're going to want to use version three of this plugin so I'm going to scroll down until I find uh my version so since I'm on 3.4 I need version one so I'm going to find the latest release of version one so here's version two Here We Go version 1.2.3 so once you find this you scroll down to the bottom there's a there's a asset section and you should be able to download the zip file here now when you you're going to download the zip and you're going to extract it so for me I actually downloaded the previous version 1.2.2 because I missed that one but whatever version you download you just want to right click it and extract all so once you uh extract it it should take you to this folder that has this Godot get plug in here and I think newer versions might have this add-ons folder built in but what you want to do is you want to take this uh this Godot git plug-in folder and you want to copy that over to your project I'll show you the easiest way to do that so if you go into your project so here I have my game open if you right click your resources folder here and you go to open in file manager this will bring it open in your file manager and if you you have a add-ons folder you're just going to copy and paste it right in there if you don't have an add-ons folder what you're going to do is you're going to just create a a new folder you can also do Ctrl shift n on Windows and just name it add-ons but they require that you have to have the uh in the root of your project it has to be add-ons and then the Godot get plug-in and then all the other stuff that comes with it so once you copy that over uh you can proceed to the to the next step so next it says open your project using the Godot project manager so just open uh Godot now it's going to have you set it up so when you go when the project loads up you're greeted with the Godot editor you know and love however you now have the option to set up a VCS plugin from the editor so if you go to Project Version Control and then set up Version Control so we go here so project version control setup Version Control now this should uh detect that you're going to be using git API I think this is the only Version Control they currently support right now so but it's there and then uh you can go to initialize and on older versions so on version one of the plugin it's going to act like it didn't do anything but once you hit uh initialize on it it actually added a Version Control tab down here and also added a commit tab up here by your inspector um I think version two and up will actually bring up another window asking you to like enter in some details uh if you want to see what that looks like it should bring up the setup Version Control window and then I think version three uh brings up a similar window so version three brings up a similar window asking you to connect to your uh your version control system so version one the one I'm using doesn't have that uh but versions two and three do so if you're using that you might encounter that you just want to use the same username password that you use for GitHub and I haven't had to mess with this yet it might ask you for more information on that but I haven't had to do this for myself so now that we've done that if if in uh Godot we look at our commit you can see I've got all these changes here now if this is the first time you're setting it up this should show your entire project as changes so here let me actually move myself out of the way here so you can see once you have these changes selected to be staged you can hit stage selected this stages them to be committed and then once you're ready you have all your changes staged you can type in a commit message here so initial commit of my project and then you you could hit commit changes here and what that will do is that will commit it to the main branch of your project but this doesn't actually send it to GitHub I think version 2 and version 3 of the plug-in will allow more stuff in the editor to be able to push your changes but version one of the plugin doesn't let you do anything for that so rather than using this I switched to using the uh the command line because even if this doesn't work and you you can still do this for all of your uh projects regardless of what you're working on and I have a handy list of uh commands here that that you can run so before we start running stuff the best way to do this I'm gonna get rid of this and I'm not gonna these these should not be staged so if you go in agado and again you right click on your resource folder here your your project root and you go to open in file manager if you just right click on a random spot you should have an option to open git bash here now that we have git installed and this opens up that little command prompt set to this uh directory it's important if you're going to be using any git commands you want to make sure that you open it up at your project root that way uh it does things correctly otherwise if you start running commands it just either won't work or worse if it does work it's going to break things but so just open it and at the root of your directory and you should be fine so what we can do here is we can run a command called git status and this just shows the current changes that we have to be committed so if you're the first time you're doing this you're going to see a whole lot of changes but this is this is showing you exactly what it shows over here um it's just that it's showing you in a command line so what's actually happening is that whenever you hit refresh it's actually running this get status command for you that's all it's doing now if you want to Stage these changes to be committed if you want to Stage every single change you can do git add and in a period a period uh is uh tells git to do everything so if we do git add boom that's the equivalent of it being staged now if you run git status again you can see now that we have these changes to be committed they're staged they're now in in green that again that git add is just the same as doing uh stage selected here so now what you're going to do is if you want to commit it you're going to do git commit Dash m and in in quotations you're going to put a commit message so for you this might be the uh initial commit of my entire project for me since I've already done this I just made a a few changes to some ships I'm just going to say uh fixed some uh node placement on some ships so that'll be my commit message on on what I did so if I hit that you can see I've got three files changed 16 insertions 10 deletions so I just I tweaked a few things now if you run git status again you're gonna it's gonna say nothing like you're you're on Branch main nothing to commit your working tree is clean so that's the extent of what this does for you in uh the the Godot plug-in for version one for version two and three I think they allow you to actually push to your repository but if you want to actually push to GitHub what we have to do first is we have to go back into GitHub and um if you just hit the little uh GitHub icon up here it'll take you back to the home page here and you can hit new here to create a new repository and this is where you'll just pick the name so LOL my LOL my game like whatever you want to call it and then you can have a description if you want you can set to I would recommend setting it to be private if it's your own project and then what you're going to do is you're going to skip the rest of these sections so just do the name set to private and then create repository so what this is going to do I've already done this so if I go back I have this LOL my game repository that's empty right now so this is uh so once you hit uh create it's going to display this uh this screen here that's going to give you some options here the most important thing for you is this uh push to an existing uh repository from command line so what this is going to do this get remote ad origin this is going to tell git that hey I want to uh set this remote origin uh I want this to be to be my GitHub repository and so whenever you push something you can choose to push it to origin which will be in the uh Cloud it'll be on GitHub so what you want to do is you want to copy and paste this line and you want to paste that into your command prompt and then just hit enter so I think you can right click and then hit paste and it will let you do that so just paste that in there and then that should add that as your remote and then if you want to actually push stuff to GitHub all you have to do is do git push origin Main so once you've pushed it to main you'll see it does a it does a few things now if I go back to my neurality 3092 which is the the repo the the repo I was working in you can see that I had a commit two minutes ago that I just pushed now so X wizard BGG fix some node placement on some ships so it shows your commit message and in your list of stuff here you can see that this was changed two minutes ago so this is how you're gonna push stuff to your uh to your online repository and this is fantastic because now now that this stuff is pushed if my computer blows up right now I still have all my stuff on the cloud so I can I can pull that project later uh on a new computer it when I finally get one or maybe I have an old replacement laptop or maybe I'm desperate and I I ask a buddy if I can come over and use their computer for a bit you can still pull that code from from the cloud so as a solo developer your workflow is going to look like this so you're gonna you're gonna be in a Godot you're gonna be making whatever changes you want if I hit this uh refresh now this all goes away because I have nothing else to commit because I already committed and pushed it but I think this will actually go away when you restart uh Godot I think you have to go in a project and like set up Version Control every time if you want to use it through here the plugin itself does a few things behind the scenes to help set up uh git to work the way it wants to so realistically I only had to do this one time and then from there everything that I want to do I'm just I'm just working in a Godot like I normally would and then when I'm ready to push changes to my online repository I'm just right clicking on my resource uh opening in file manager right clicking A Blank Spot opening up get bash and then I'm doing a git status to see what changes I've got I'm doing a git add to Stage those to be committed then I'm doing a git commit to commit those and then I'm pushing that uh that that change to my GitHub so a look at that workflow is git status to check changes get add period we'll add every uh we'll add all changes to to be staged git commit Dash M with your commit message in quotations and then git push origin main to push it to GitHub and if if you're a solo developer and you're just working in your main branch all the time this is perfectly fine uh nothing wrong with it and you can this simple workflow will get it so that as long as you keep remembering to do this you'll be able to have all your stuff online and in the future if maybe your game starts getting bigger maybe I don't know maybe you hire more developers or you start working with friends on it you already have Version Control set up so what that means is that on GitHub you could have them make GitHub users and then you could give those users access to your project and then that way they can actually pull code and start working on it too now if you have multiple developers working on on the same project this is where Version Control shines because it allows you to track everyone's changes and the way that you're doing it right now as a solo developer where you're just constantly committing and pushing to the main branch is not going to be what you want to do when you're working with multiple people if you're working with multiple people on on a collaborative project then the workflow changes uh a little bit so what you're going to want to do is you're going to want to keep your main branch that's like your that's like your point of truth that's like what is uh your your last stable progress um and you're going to want to Branch off of that so you're going to want to create a branch for whatever small task you are working on so say if uh if I go back into my game here and I go into my main script this is where I kind of keep my own to-do list here so say if I have research and fix the following bugs say if I'm going to research this clear scene function does not clear projectiles or select a Target Target indicators say if I'm going to tackle this issue I'll make a branch um just to just to tackle this and then I'll I'll fix this bug and then I will uh commit my changes to that new Branch I made and then I will also push that Branch up to GitHub so that other people can look at it so I'll show you what that looks like so say for example if this was where the bug is right I'm going to make it change this file I made a change to this file so say that that thing I saved was actually the affix and I want to commit that to my Branch so what I'm going to do is in my uh I'm going to close one of these because I don't need all these open is in my uh terminal which again right click resources open in a file manager file explorer and then right click a empty spot that way you're always working in your root directory for your project um so once you have that terminal open what you can do is you can use the command git checkout with a dash B and this is going to create a new branch and this is going to be I'm going to name my Branch um I'm just going to name it get demo how about that so I'm gonna name my Branch git demo like you could name it whatever you want so if you're fixing a bug you can call it something like you know uh clear scene bug fix um if you're working with a lot of people sometimes people might like to put like the date and time stamp of when the branch was created um it's up to you guys so for me I'm just going to create a new branch called get demo so now what this has done is that I've switched to a new Branch so I'm no longer working on my main branch I made a new Branch off of Maine called get demo and now what I'm going to do is I'm going to git status and you can see I have uh I'm on Branch git demo and I have one modified file that's not staged so if I want to Stage it I'll do git add again similar workflow git status you can see that now it is staged to be commit to this Branch git demo and I will get commit Dash M added comment on Main Dot GD for demo purposes right so this is the change that I made so once I hit enter on that that is now committed to get demo Branch so now if I want to push my Branch to GitHub so that other developers can review it I'll do git push origin and I'll do my actual Branch name so I'll do git demo and what this will do is that this will push it up and if I now if I go back to uh GitHub you can see it pops this up git demo has had recent pushes less than one minute ago and so that's cool so if we go to compare and pull requests what this does is that this is going to set up a pull request to pull in your changes from this Branch back into Main and so here you're going to put like you know description of changes and so I'll just do modified a comment right but if you were actually doing something where you actually fixed a bug you would put you know description of changes what you had to do to fix that bug you might also add like a section that determines how you tested that this bug was resolved and then down here it shows you an actual change of what you did so you can see here I added a uh a line to this file but whatever change you might do this lets other developers see this change and so what you can do is that you can create this pull request and then the other developers that you're working with can do a code review on it for you so so they can you can copy this link and then send it to them and they can come here and they can see okay so you made you modified a comment let me look at your files changed and they can come here and then they can do a code review so you can add comments to files by clicking on here and then once you're done and you're happy with it you can choose to comment approve it uh if it's good you can request changes if you find problems with it and then you could submit that review since I'm the only only developer I can't approve my own pull request that I created so I just did this just for demonstration purposes if you are working with other Developers so once you have a pull request that is approved then you can actually merge it and what this does is this will merge in your changes back into the main branch boom there we go so it says pull request successfully merged and closed we can delete this Branch now and if we go back to our code here uh we can go look at main.gd and you can see I added a comment uh on Main GD for demo purposes two minutes ago and so this is another important thing so now that I deleted that branch I'm going to switch back to the main branch so first things first I'm actually going to close um Godot because this uh there's a there's a comment on the documentation that uh so known issues always close the editor before running git pull otherwise you may lose data if you synchronize files while editor is open so the only time you should ever have to use git pull is if you are um pulling stuff from GitHub so I'll show you why that's important so let me close uh a Godot there we go so now that I have uh Godot closed what we want to do is we want to get check out and then we want to go back to main so get uh so check out without any other flags is just going to switch us back to the main branch so if I do git checkout main now we've switched back to Maine now the problem is we've updated main on the cloud but we haven't pulled in those changes from the cloud to be on our local system yet so we're going to do git pull origin Main and what this is going to do is this is going to pull in that change that was merged in from my Branch back to my main so now that I've pulled main I have an up-to-date starting place and I can uh I can check out another Branch if I want to so this is like a very common workflow sometimes if you're working on a branch for a long time you might need to actually pull main into that working Branch before you merge the working Branch back into Main so if you're working with other developers on stuff lean on them as a resource I probably shouldn't even went into this for this video because most people who are using Godot are probably hobby developers but in the event that you are working in a in a team and you haven't really messed with Git before I thought that there might be some useful information here but again for for the most part as a solo developer your workflow is just going to be get status to check changes you're going to be adding all of those changes to be staged to be committed you're going to commit them to your main branch which you probably should still be on Main because we did we never change branches here and then you're going to push that change to your main branch and that will push it out to GitHub so that's your main workflow if you are working with a team there's some other commands here that you need to know get checkout Dash Dash and a file name will remove unstaged changes so what I mean by that is it will revert the file back to when you made changes to it so if I actually go into uh a Godot and I make a change to a file and I want to revert that file back to how it was before I made changes I can do that with this command if I want to pull in current changes from a Target Branch into an existing Branch so this is where I was talking about earlier where you might need to pull in main if you're working in a branch so say if I do git checkout Dash B to create a new branch and then I've been working in that Branch for you know maybe two weeks trying to narrow down this this really annoying bug and in the meantime other developers have already merged several other changes into that that main branch I have to before I can merge my Branch back in because my branches like several commits behind so I actually have to pull in changes from Main into my Branch resolve any merge conflicts that that might be there maybe another developer made a change in a file that I was working in so I have to make sure that those work with with my changes once everything is good then I can I can put in that that pull request to merge my changes back into Main so that's how multiple developers can work on that so git pull origin allows you to pull from whatever is currently on GitHub um and you can pull whatever Branch name so typically you're probably going to be pulling main for the most part if you want to see what changes you've made to a file within the console you can do git diff and you can do a file name and it'll show you what changes you've made directly there in the console so that that's useful for if you're determining what changes you want to Stage you don't remember what you did to a specific file you can just do a git diff right there in the console and it'll show that for you I think the newer plugins uh for Godot will actually show that on the bottom panel in the the Version Control Panel it'll just show you that that diff for you automatically whenever you have a file selected if you want to switch to an existing Branch you just use git checkout and then the branch name so checkout is used a few times so check out with dash dash we'll revert a file um check out without anything we'll just switch to a different branch check out where the dash B will make a new Branch so handy commands there I figured I would include those so that way um you know people can get something out of it but so that's how you do Version Control in uh Godot and if you do it with the command prompt it will work regardless of what version you're working in um and I think if you're for some reason using an even older version of Godot you can still set it up using command prompt so I hope that helps and let me know if you guys have any questions in the comments I'll answer them to the best of my ability and uh yeah thank you so much for watching [Music] thank you [Music]

Channel: Axe Wizard

Views: 10,212

Keywords: Axe, Wizard, Beards, Games, Guitars, Godot, Github, Git, Version, Control, Indie, Game, Dev, Engine, Developer, Development, Branch, main, master, pull, push, request, merge, status, git status, git commit, git pull, git push, git checkout

Id: tlgKAQ5nl9Y

Length: 42min 27sec (2547 seconds)

Published: Wed Mar 29 2023