签出后Git（Sourcetree）问题
我是Git的初学者。我学习了如何在终端中使用，但现在我使用SourceTree。一切都很好，但第一次结账的时间到了。签出后，我继续我的任务，现在我有了这两个分支，我不知道如何将以后的更改推送到remote。在remote上，我只看到我签出的那个。我是否应该将签出后Git（Sourcetree）问题,git,github,atlassian-sourcetree,Git,Github,Atlassian Sourcetree,我是Git的初学者。我学习了如何在终端中使用，但现在我使用SourceTree。一切都很好，但第一次结账的时间到了。签出后，我继续我的任务，现在我有了这两个分支，我不知道如何将以后的更改推送到remote。在remote上，我只看到我签出的那个。我是否应该将master设置为HEAD？我可以输入终端，我不关心SourceTree 谢谢你的回答 如果您想将HEAD与主/原始分支混合使用： 进入你的大脑，打开控制台： // (You are currently working on a detac
masterHEAD谢谢你的回答 如果您想将HEAD与主/原始分支混合使用： 进入你的大脑，打开控制台：
// (You are currently working on a detached HEAD and not in a proper branch)
git checkout -b harvestFile // Checkout your detached HEAD to a new branch Properly
git checkout master // Go back to your master branch
git merge harvestFile // Merge HarvestFile into master
git push origin // Push master to your remote.
// (You are currently working on a detached HEAD and not in a proper branch)
git checkout -b harvestFile // Checkout your detached HEAD to a new branch Properly
git checkout master // Go back to your master branch
git merge -s ours harvestFile // Merge HarvestFile into master only keep harvestFile branch commits
git push origin // Push master to your remote.
// (You are currently working on a detached HEAD and not in a proper branch)
git checkout -b <branchname> // Checkout your detached HEAD to a new branch Properly
git push -u origin <branchname> // Push and create <branchname> on your remote.
// (You are currently working on a detached HEAD and not in a proper branch)
git checkout -b harvestFile // Checkout your detached HEAD to a new branch Properly
git checkout master // Go back to your master branch
git merge -s ours harvestFile // Merge HarvestFile into master only keep harvestFile branch commits
git push origin // Push master to your remote.
// (You are currently working on a detached HEAD and not in a proper branch)
git checkout -b <branchname> // Checkout your detached HEAD to a new branch Properly
git push -u origin <branchname> // Push and create <branchname> on your remote.
//（您当前使用的是分离的磁头，而不是正确的分支）
git checkout-b//正确地将分离的头签出到新分支
git push-u origin//push并在远程设备上创建。
git推送源分支bgit签出分支机构Agit合并分支Bgit推送源分支谢谢你的回答。我遇到了一些复杂问题（冲突），但最后使用Sourcetree放弃了冲突的更改，所有更改都出现在新分支上的remote中 我学到的是，在这种情况下，有必要创建新的分支以向前推进 下面是终端转储，如果我做错了什么，请纠正我
$ git checkout -b mailing
Switched to a new branch 'mailing'
.../APFA 1.0/APMailTool (mailing)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
.../APFA 1.0/APMailTool (master)
$ git merge mailing
Auto-merging AP_MailCreation.bas
CONFLICT (content): Merge conflict in AP_MailCreation.bas
Automatic merge failed; fix conflicts and then commit the result.
.../APFA 1.0/APMailTool (master|MERGING)
$ git merge -s ours mailing
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
$git checkout-b邮件
切换到新的分支“邮寄”
…/APFA 1.0/APMailTool（邮寄）
$git签出主机
切换到“主”分支
您的分支机构是最新的“原始/主”分支机构。
…/APFA 1.0/APMailTool（主）
$git合并邮件
自动合并AP_MailCreation.bas
冲突（内容）：在AP_MailCreation.bas中合并冲突
自动合并失败；修复冲突，然后提交结果。
…/APFA 1.0/APMailTool（主|合并）
$git merge-s我们的邮件
错误：无法合并，因为您有未合并的文件。
提示：在工作树中修复它们，然后使用“git add/rm”
提示：根据需要标记解析并进行提交。
致命：由于未解决的冲突而退出。