如何将主存储库的更改合并到我自己的更改？

Question

I'm new to Github and I am modifying an existing WP plugin. I forked the "master" branch into what I believe can now be called my repo. That all seemed fine.

I was making changes to the files on notepad++ but now the author has released some changes.

1. Is it possible to upload the entire plugin to my repo?

2. After that, can I merge the author's changes into mine without deleting all the changes I made?

Answer 1

You have two options, neither of which will guarantee that you won't have conflicts:

1) Run a git stash to save your changes. Then checkout out master and pull so you get the other developer's changes. Go back to your feature branch git rebase master and then git stash pop to reapply your changes on top of the other developer's work. Resolve any conflicts and continue.

2) The other option is pretty much the same but rather than stashing your changes you commit your work before rebasing with master. It depends really on the nature of the work, whether you need to make use of the other developer's changes on which option you go for. If your changes are pretty isolated then the latter option may be preferred.

You can merge master into your feature branch but this isn't as "nice" an option. You can see the difference between the two here: https://www.atlassian.com/git/tutorials/merging-vs-rebasing