Warning: file_get_contents(/data/phpspider/zhask/data//catemap/9/git/22.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181

Warning: file_get_contents(/data/phpspider/zhask/data//catemap/2/github/3.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181
Git[Hub]PR合并请求重定基址_Git_Github - Fatal编程技术网

Git[Hub]PR合并请求重定基址

Git[Hub]PR合并请求重定基址,git,github,Git,Github,我知道这个问题被问了很多次,但我不明白 假设我有这棵(自制的)树: 我想通过GitHub的Pull请求将featureA合并到master,但“实现功能B”已经创建了我通过GitHub UI解析的合并确认。现在我有了一个新的合并提交: | --- PREVIOUS COMMITS --- * Bump version to 0.2 [master branch] | \ Create branch 'featureA' in fork | * Implement feature A [fe

我知道这个问题被问了很多次,但我不明白


假设我有这棵(自制的)树:

我想通过GitHub的Pull请求将featureA合并到master,但“实现功能B”已经创建了我通过GitHub UI解析的合并确认。现在我有了一个新的合并提交:

| --- PREVIOUS COMMITS ---
* Bump version to 0.2 [master branch]
| \  Create branch 'featureA' in fork
|  * Implement feature A [featureA branch]
* | Implement feature B [master branch]
| * Merge 'master' into featureA [featureA branch]
现在在Pull请求中,Changes选项卡只希望合并我的更改(例外)。但是,当我尝试将合并提交(根据项目所有者的请求)重新设置为上一个提交的基础时,它希望重新设置主提交的基础。如果我这样做,它希望在上游上再次合并所有上游更改。我如何在一次提交中重新设置所有内容的基础,而不让它认为应该合并上游内容

编辑:它看起来应该是这样的:

| --- PREVIOUS COMMITS ---
* Bump version to 0.2 [master branch]
* Implement feature B [master branch]
* Implement feature A [merged featureA branch]
但当我什么都不做的时候,我会这么看:

| --- PREVIOUS COMMITS ---
* Bump version to 0.2 [master branch]
* Implement feature B [master branch]
* Implement feature A [merged featureA branch]
* Merge 'master' into featureA [merged featureA branch]

我不清楚您在这里想要实现什么,您至少应该添加一个分支图,显示最终状态应该是什么。好的!我要补充一点。我不清楚你想在这里实现什么,你至少应该添加一个分支图,显示最终状态应该是什么。好的!我要补充一点。
| --- PREVIOUS COMMITS ---
* Bump version to 0.2 [master branch]
* Implement feature B [master branch]
* Implement feature A [merged featureA branch]
* Merge 'master' into featureA [merged featureA branch]