Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

2
  • what about conflicts ? Commented Apr 7, 2014 at 13:48
  • 1
    It needs some research, but you can ignore changes in local files via .gitignore and .git/info/exclude. Not sure how conflicts would be solved when you add tracked file there. Commented Apr 7, 2014 at 13:51