Hi, I'm trying to contribute some documentation to a larger project for which I created a git account and forked from the project's master via the github web page. Via the local github mac-application I created a local copy where I can work on. In order to avoid to work on outdated documents, is there a way where I can update my fork from the master with showing me possible conflicts? I.e. in case I already altered a file locally and/or my online fork while somebody else also worked on the same document. Thanks, Michael.
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/hABihBJ4fZEJ. To post to this group, send email to firstname.lastname@example.org. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.