I am trying to understand forking on gitub. If I fork a repository, make changes to it, and then try and merge changes from th original repository, I run into problems. Is this a valid workflow? Why does merging from the original forked repository present problems? I know I have chnged it. I am happy to accept the updates. But git seems unwilling to accept updates and merge them with my changes without massive command line intervention involving stashing.

Hi @ozarchie,

This post was moved to a different board that fits your topic of discussion a bit better. This means you’ll get better engagement on your post, and it keeps our community organized so users can more easily find information.

As you’ll notice, your topic is now here in the How to use Git and GitHub board. No action is needed on your part; you can continue the conversation as normal here.


Hi @ozarchie ,

This is absolutely a valid workflow, and should not present any issues. You may be running into merge conflicts, which are a normal part of distributed development and can be solved in a variety of ways. If you’re seeing other problems, please let us know more details (such as the commands you’re using, and their output).