Wiki Staff
6,186
edits
Setting up git: Difference between revisions
Jump to navigation
Jump to search
m
no edit summary
m (typo) |
mNo edit summary |
||
| (One intermediate revision by the same user not shown) | |||
| Line 98: | Line 98: | ||
*A commit is confirmed change of the files in your repo, it's how you make changes permanently to the files in your repo, so try not to commit without making sure it works (though subsequent commits can fix it). | *A commit is confirmed change of the files in your repo, it's how you make changes permanently to the files in your repo, so try not to commit without making sure it works (though subsequent commits can fix it). | ||
*As said before, you should use different branches to separate your commits/changes. Don't commit to master. It should be clean, so you can fall back on it if needed. | *As said before, you should use different branches to separate your commits/changes. Don't commit to master. It should be clean, so you can fall back on it if needed. | ||
*To make your commits, you need to edit the files using BYOND's inbuilt editing tools. | *To make your commits, you need to edit the files using BYOND's inbuilt editing tools. When you're finished, right click the folder you're working with and choose '''Git Commit -> "[Your Branch Name]"''' (Example: Git Commit -> "My_First_Branch") | ||
*You can then select only the files you want to be committed by ticking or unticking them. You should also write a detailed commit summary, detailing what happened in that commit. | *You can then select only the files you want to be committed by ticking or unticking them. You should also write a detailed commit summary, detailing what happened in that commit. | ||
*Click '''Ok''' and the commit will be committed to your local repo! | *Click '''Ok''' and the commit will be committed to your local repo! | ||
| Line 110: | Line 110: | ||
*Head to your GitHub repo e.g https://github.com/NAME/Yogstation.git | *Head to your GitHub repo e.g https://github.com/NAME/Yogstation.git | ||
*Click '''Pull Request''' at the top right. | *Click '''Pull Request''' at the top right. | ||
*Fill out a summary and then create the pull request. | *Fill out a summary and then create the pull request. | ||
*You're done! In many cases there will be issues pointed out by other contributors, unfortunate merge conflicts, and other things that will require you to revisit your pull request. | *You're done! In many cases there will be issues pointed out by other contributors, unfortunate merge conflicts, and other things that will require you to revisit your pull request. | ||