![]() If a conflict between the changes occurs, then git stash pop will put conflict markers in your files. After the pull, you run git stash pop to merge your changes with the pulled changes. This will move your changes to the stash. If your changes overlap with the pulled changes, then Git may prompt you to run git stash before git pull. This downloads the updates from GitHub, and "fast-forwards" your working tree to the latest version of master, or it tells you if your tree is already up to date.Īlso, if you have made any local changes to the source, these will be preserved. If you have previously downloaded the repository and a new version is available on GitHub, you can update your working tree to the latest version. You can now skip to step 3 if you just want to compile the latest version. ![]() All git commands given from now on assume your shell's working directory is the openttd/ directory. The working tree tracks the latest version of our "master" branch. This downloads the repository and makes a "working tree" in the directory openttd/. To obtain the source code from GitHub, type from command line: For you as a user this means you can quickly get the newest sourcecode. Git tracks various versions and shares our code. The most current version of the official code is stored in our Git repository ( ). ![]() Enter this directory, and you're ready to proceed to step 3. 3.2 openttd, where is the version you downloaded.Compiling commands, running the compiled binary Required/recommended software and how to install it
0 Comments
Leave a Reply. |