Working with someone who just learned Git.
Woke up this morning to 200 .DS_Store files on master.
-.-

I guess the guide didn’t talk about .gitignore file😄

@code-god or pull requests

Ah the famous Mac user learning git routine 😂

Now you get to teach him about both ignoring files, and rewriting commit history!

.DS_Store files are a WTF in themselves.

lol mac

And then you should restrict pushing to master and only authorize merge from dev.

In "master"? Then someone else made a mistake. Can't have the code of a person just learning git, just like that in master without a review.

@gopher Depends on the project and learning curve. Critical project, absolutely. But side project where there's one or two people working on it, and it's deliberately meant as a "let's keep Git as simple as possible" project - totally appropriate to forgo branches and commit to master.

@AlmondSauce if there’s enough folders for 200 .DS_Store files, I would say it’s time to add some basic restrictions for version control.

@123username that's a fair point!

how much I hate apple for all this folders when people send me files from their stupid macs

@gopher I wasn't aware that he was new to Git until the situation happened. Guess I should watch out in the future.