search

Sushisushi-sandesu / sushi

:sushi:
0 stars 0 forks source link

Don't ignore meta files #18

Closed tomoasleep closed 8 years ago

tomoasleep commented 8 years ago

Sorry, I didn't know that meta files of asset files are used by scenes to refer the asset files. I remove *.meta from .gitignore not to ignore meta files.

References (Not official): http://qiita.com/wordijp/items/3e4b87756fd11c893a9d http://answers.unity3d.com/questions/932348/visible-or-hidden-meta-files-with-git.html

Review plz @Sushisushi-sandesu/all

natezzz commented 8 years ago

@tomoasleep OMG. Now everyone has his own copy of .meta files. Whose .meta files should we start tracking again?

According to this, we need to change the version control mode to "Visible meta files" too.

tomoasleep commented 8 years ago

I'm planning that I or you add .meta files in this pull request now and other ones delete their own .meta files.

natezzz commented 8 years ago

@tomoasleep Please add the .meta files. We will sync with yours.

tomoasleep commented 8 years ago

:ok_woman:

tomoasleep commented 8 years ago

@natezzz After we merge this PR, please let the PR https://github.com/Sushisushi-sandesu/sushi/pull/11 merge (or rebase) the updated master branch.

natezzz commented 8 years ago

@tomoasleep Is the PR #11 approved for a merge?

tomoasleep commented 8 years ago

@natezzz No. In order to check if the PR #11 moves, we have to merge changes from the updated master branch into the branch camera_app (#11). (we run git merge master on camera_app.) (Otherwise, we have to rebase camera_app branch on the updated master branch.)

tomoasleep commented 8 years ago

Retracked existing .meta files.

natezzz commented 8 years ago

@tomoasleep Review passed.

natezzz commented 8 years ago

@tomoasleep So the next steps are:

  1. You merge this PR into master.
  2. I merge master into camera-app.
  3. Review camera-app.
  4. Merge camera-app back into master.

Is that correct?

tomoasleep commented 8 years ago

@natezzz Yes, that's right.

natezzz commented 8 years ago

@tomoasleep :ok_woman:

tomoasleep commented 8 years ago

@Sushisushi-sandesu/all another one please review this PR.

harihitode commented 8 years ago

I've caught up. Thanks your research.

Am I right?

tomoasleep commented 8 years ago

@harihitode Yes, that's right :ok_hand:

neetp7k9 commented 8 years ago

Thanks for your effort, I will include *.meta in my commit.

tomoasleep commented 8 years ago

It's OK to merge?

harihitode commented 8 years ago

yes. no problem.

tomoasleep commented 8 years ago

thx~