blocks|key|1576782|text|他应该创建一个分支来镜像你的“上游”分支，提交/合并/樱桃挑选他想要推到上游的提交，有时还会对你的repo中的一个分支进行git-push。然后，您应该检查该分支中的提交，并将它们合并到您的主分支。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1576783|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

He should create a branch which will mirror your "upstream" branch, commit/merge/cherry-pick to it the commits he wants to push upstream, and sometimes do a git-push to a branch in your repo. Then you should review the commits in that branch and merge them to your main branch.

blocks|key|2985631|text|git+clone+git://yourrepo.com/project.git|type|code-block|depth|inlineStyleRanges|entityRanges|data|syntax|javascript|2985632|创建一个被跟踪的远程分支。这意味着拉取和推送操作是通过主分支自动完成的。跟踪分支可以是origin/dev或origin/master。随你怎么说。|unstyled|2985633|git+checkout+--track+-b+mylocalbranch+origin/trackedbranch|2985634|在此之后，一个正常的git工作流程将通过本地提交等方式完成。有时候他应该这样做，|2985635|git+pull+--rebase|2985636|这将执行rebase操作，该操作回滚他的更改，拉入对远程分支所做的更改，然后在此基础上重放其本地更改(解决任何冲突；执行任何合并)。|2985637|当他完成并想要使这些更改生效时，他应该让事情变得更新：|2985638|git+pull+--rebase+#+get+most+recent+changes|2985639|然后，对于一个裸存储库：|2985640|git+push+#+push+his+changes+to+the+main+repo|2985641|如果它是一个非裸存储库(比如您的主文件夹中的存储库或类似的存储库)，那么最好是他通知您他已经准备好了，然后您再执行|2985642|git+pull+/path/to/his/repo|2985643|通常建议不要推送到非裸存储库。原因是你可能在你的本地有未提交的更改，当他推到它的时候，混乱可能随之而来的是details。内核陷阱线程讨论此pit+fall|offset|length|2985644|entityMap|0|LINK|mutability|MUTABLE|url|http://www.gitready.com/advanced/2009/02/01/push-to-only-bare-repositories.html|1|http://kerneltrap.org/mailarchive/git/2007/3/18/241553^0|0|0|0|0|0|0|0|0|0|0|0|0|1H|7|0|1Y|8|1|0^^$0|@$1|2|3|4|5|6|7|1E|8|@]|9|@]|A|$B|C]]|$1|D|3|E|5|F|7|1F|8|@]|9|@]|A|$]]|$1|G|3|H|5|6|7|1G|8|@]|9|@]|A|$B|C]]|$1|I|3|J|5|F|7|1H|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|1I|8|@]|9|@]|A|$B|C]]|$1|M|3|N|5|F|7|1J|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|1K|8|@]|9|@]|A|$]]|$1|Q|3|R|5|6|7|1L|8|@]|9|@]|A|$B|C]]|$1|S|3|T|5|F|7|1M|8|@]|9|@]|A|$]]|$1|U|3|V|5|6|7|1N|8|@]|9|@]|A|$B|C]]|$1|W|3|X|5|F|7|1O|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|6|7|1P|8|@]|9|@]|A|$B|C]]|$1|10|3|11|5|F|7|1Q|8|@]|9|@$12|1R|13|1S|1|1T]|$12|1U|13|1V|1|1W]]|A|$]]|$1|14|3|-4|5|F|7|1X|8|@]|9|@]|A|$]]]|15|$16|$5|17|18|19|A|$1A|1B]]|1C|$5|17|18|19|A|$1A|1D]]]]

<pre><code>git clone git://yourrepo.com/project.git
</code></pre>

Create a tracked remote branch. This means that pulls and push operations are automatically done with the main branch. The track branch might be origin/dev or origin/master. Whichever.

<pre><code>git checkout --track -b mylocalbranch origin/trackedbranch
</code></pre>

After that a normal git work flow is done with local commits and such. Occasionally he should,

<pre><code>git pull --rebase
</code></pre>

This will perform a rebase operation which rolls back his changes, pulls in the changes made to the remote branch, then replays his local changes on top of that (resolve any conflicts; perform any merges).

When he's done and wants to make those changes live, he should bring things current:

<pre><code>git pull --rebase # get most recent changes
</code></pre>

Then, for a bare repository:

<pre><code>git push # push his changes to the main repo
</code></pre>

If it's a non-bare repository (like your repository in your home folder or some such), then it's preferred that he notify you that he's ready and then you do the

<pre><code>git pull /path/to/his/repo
</code></pre>

It's generally advised not to push to non-bare repositories. The reason being you could have uncommitted changes in your local and when he pushes to it, chaos can ensue <a href="http://www.gitready.com/advanced/2009/02/01/push-to-only-bare-repositories.html" rel="nofollow noreferrer">details</a>. Kernel trap thread discussing this <a href="http://kerneltrap.org/mailarchive/git/2007/3/18/241553" rel="nofollow noreferrer">pit fall</a>

blocks|key|1576884|text|这看起来像是在描述一个工作流程，其中一个功能与主分支同时开发。上面的答案是好的，但应该注意的是，"rebase“并不总是必要的。特别是对于git初学者来说，因为rebase相当于历史修改，是一个中间概念，如果你想在提交历史中保留分支的位置和时间的信息，它并不总是你想要的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1576885|当你的朋友想要从你的主分支引入更改时，他总是可以使用普通的香草合并而不是rebase：|1576886|git+fetch+origin
git+merge+origin/master++#+or+any+branch+he+wants+to+merge+other+than+"master"|code-block|syntax|javascript|1576887|当你想要拉回你朋友的修改时，你可以做一个类似的操作：|1576888|git+fetch+friend
git+merge+friend/feature++#+choose+any+of+your+friend's+branches+to+merge+with+your+current|1576889|如果您有他的存储库的URL+(本地或其他)，则上述工作流可以工作。如上所述，推送到非裸存储库(您的)是危险的。如果你需要你的朋友能够推送，使用一个公共的，裸露的存储库。|1576890|如果您只想从朋友的分支中选择特定的修订版本来拉取，请使用cherry-pick命令：|offset|length|style|CODE|1576891|git+fetch+friend
git+log+friend/feature++#+or+`git+log+friend`
#+find+the+commit+you+want+to+cherry+pick,+then
git+cherry-pick+<commit>|1576892|entityMap^0|0|0|0|0|0|0|S|B|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|10|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|11|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|12|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|13|8|@]|9|@]|A|$]]|$1|O|3|P|5|6|7|14|8|@$Q|15|R|16|S|T]]|9|@]|A|$]]|$1|U|3|V|5|F|7|17|8|@]|9|@]|A|$G|H]]|$1|W|3|-4|5|6|7|18|8|@]|9|@]|A|$]]]|X|$]]

It seems like you are describing a workflow where a feature is developed concurrently with the main branch. The answers above are good, but it should be noted that a "rebase" is not always necessary. Especially for a git beginner, since a rebase amounts to a history modification, is an intermediate concept, and is not always what you want if you want to keep information about where and when a branch is made in your commit history.

When your friend wants to pull in changes from your main branch, he can always use plain, vanilla merge instead of rebase:

<pre><code>git fetch origin
git merge origin/master # or any branch he wants to merge other than "master"
</code></pre>

When you want to pull your friend's changes, you can do a similar operation:

<pre><code>git fetch friend
git merge friend/feature # choose any of your friend's branches to merge with your current
</code></pre>

The above workflow works if you have a URL (local or otherwise) to his repository. Pushing to a non-bare repository (yours) is dangerous, as noted above. If you need your friend to be able to push, use a public, bare repository.

If you want to only select specific revisions from your friend's branch to pull, use the <code>cherry-pick</code> command:

<pre><code>git fetch friend
git log friend/feature # or `git log friend`
# find the commit you want to cherry pick, then
git cherry-pick &lt;commit&gt;
</code></pre>

I'm having a blog-project on GibHub, where a friend of mine, wants to base his code on.
He will make some changes to some files that he do not wish to commit back to me (maybe stylesheets and images), but he will maybe implement a new feature that he would like to push back to my project. 

He should also be able to get new code from me, where he would like to get all new stuff.

I've looked around, and it seams that Rebase is the way to go for him, to get updates from me, but how can he most easily push a feature back to me? (He is just learning Git, as well as me)

How to best work with a "forked" a git repo, and push some new features back to origin

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

我在GibHub上有一个博客项目，我的一个朋友想把他的代码作为基础。他将对一些他不希望提交给我的文件(可能是样式表和图像)进行一些更改，但他可能会实现一个新功能，他希望将其推回到我的项目中。他还应该能够从我那里获得新的代码，在那里他希望获得所有新的东西。我看了看周围，看起来Rebase是他的方式，从我那里获得更新，但是...

问如何最好地使用"forked“的git代码库，并将一些新特性推送回原点。
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何最好地使用"forked“的git代码库，并将一些新特性推送回原点。EN