Artist git cheatsheet

This is a small document to help artists use some git stuff. Mostly about pull requests.

• Pull request
  • Where to make?
    • Browser
    • Github desktop
  • Making a pull request
  • Apply feedback
• Rename file
• Wrong folder
• Prefab
• Meta files

Pull request

When you have a commit on your branch, you need to make a pull request. This is done so others can check your work and integrate it into the project.

There are 2 ways to make a pull request:

• browser
• github desktop (or other version control application)

Browser

After committing your branch and going to the project repo, you will see the following:

Open a pull request suggestion

Click on this green button. You can now go to the next step.

next step

Github desktop

After committing your branch you will see this blue button, click on it.

Make pull request button

You can now go to the next step.

next step

Making a pull request

Making a new pull request

When making a pull request you see something like this image above. You can do the following steps.

• Assign yourself (this will make easy to see whose pull request it is)
• Add labels (like a art or ready for review label)
• If having only 1 commit, you can rename the pull request to the branch name. (In this case art/poster-model)
• Add a reviewer, a lead artist or git master.
• If needed, added a description. (List of assets added. Or tell the changes made to an existing asset.)

Finished pull request

Now create the pull request and wait for someone's review or approval.

Apply feedback

After getting some feedback and applying it, you can resolve the comments. This makes sure that you and others know what feedback you have applied.

Old feedback

Rename file

Renaming feedback

The red line are the folders of the asset.
The green line is the model.

Now you can rename the asset and commit again or apply more feedback.

Wrong folder

Wrong folder feedback

The red line are the folders of the asset.
The green line is the model.

To fix this simply move the textures into the right folder.

If there are many textures that are similar, you should make a subfolder. In this case textures/posters .

Prefab

Make art into prefab so it can be used. To do so, follow the steps:

1. Have a Unity scene open.
2. Drag your assets with all settings or textures etc ready.
3. Drag your assets form the hierarchy window into the project window, this should be done with the correct folder open. (Prefab)
4. Test your prefab, if nothing wrong, make a commit.

Meta files

A meta file is an Unity auto generated file that will be made when adding any file into the project. If they are missing there will be problems.

Missing meta file

To fix this, simply open Unity and commit the generated meta file.

This should not be a problem, because you need to test your art inside Unity before committing.