小编aba*_*ger的帖子

使用Windows 7,git 1.9.5.msysgit.1

我读过的关于Git中合并冲突的教程表明,合并失败会导致冲突标记被放置在文件中有问题的位置.我似乎无法实现这一点.以下是新存储库的示例工作流:

git init
notepad file1.txt    #make some edits
git add .
git commit -m "msg"

git branch mybranch
git checkout mybranch
notepad file1.txt #make some edits on line 3
git add .
git commit -m "msg"

git checkout master
notepad file1.txt #make a conflicting edit on line 3
git add .
git commit -m "msg"
git merge mybranch
#error: 'merge' is not possible because you have unmerged files

notepad file1.txt

最后一次打开file1.txt之后,我期待在第3行看到标志>>>>>>>>和==========冲突标记......但是那里什么都没有,只是主分支中显示的文件的文本.我的全局.gitconfig文件:

[user]
    name = Andrew Barger
[core] …

如何重新启动脚本？我有3个开关,我希望它们恢复到脚本的开头.

Import-Module ActiveDirectory
Write-Host "--Please Login using a.account--"
#login
$credential = Get-Credential
#Main
Write-Host "--Remote Computer Rename v2.0--"
Write-Host "1. Query AD (Outputs to a text file)"
Write-Host "2. Quick computer rename"
Write-host "3. Quit"
$choice=Read-Host "Chose a number to continue"

#AD Query for computer
switch ($choice)
{
 1 {
Write-Host "--Enter first five characters of computer name or full computer name i.e.     USCLT--"
$cn=Read-Host 'Computer name'
$out="$cn*"
Get-ADComputer -Filter 'SamAccountName -like $out' >> c:\myscripts\dsquery.txt
Write-Host "Query complete.  See dsquery.txt …