The Most Effective Way to Save an Updated Plug

Question

I can think of several ways to update the current fork version:

• git pullapply changes using script (pull automatically merges)
• git pull, merge (possible conflicts?)
• git fetch
• perhaps using another branch?

Question: What is the most efficient way to keep the current fork version?

Answer 1

Saving the current fork version is associated with the original repo: you need to base local work on the updated image of the specified original repo.

Typically, in a triangular workflow, the original repo is called upstream.

So all you have to do is:

git fetch upstream
git rebase upstream/master
git push --force

upstream/master, ( ).

pull, .
, , , , ( , )

Answer 2

git pull , . , . , .

git fetch, . , .