git push常见问题及解决方案

# 错误信息
remote: Invalid username or password.
fatal: Authentication failed for 'https://github.com/user/repo.git'

# 方法1：重新配置用户信息
git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"

# 方法2：使用个人访问令牌（GitHub推荐）
# 在GitHub生成Personal Access Token后
git remote set-url origin https://username:token@github.com/user/repo.git

# 方法3：使用凭据管理器
git config --global credential.helper store
# 下次push时输入用户名和token，会自动保存

# 方法4：清除已保存的凭据
git config --global --unset credential.helper
# Windows系统
git config --global credential.helper manager-core

# 错误信息
Permission denied (publickey).
fatal: Could not read from remote repository.

# 1. 检查SSH密钥是否存在
ls -la ~/.ssh/

# 2. 生成新的SSH密钥
ssh-keygen -t ed25519 -C "your.email@example.com"
# 或使用RSA格式
ssh-keygen -t rsa -b 4096 -C "your.email@example.com"

# 3. 启动SSH代理并添加密钥
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_ed25519

# 4. 将公钥添加到GitHub/GitLab
cat ~/.ssh/id_ed25519.pub
# 复制输出内容到Git平台的SSH Keys设置

# 5. 测试SSH连接
ssh -T git@github.com

# 6. 修改远程仓库URL为SSH格式
git remote set-url origin git@github.com:username/repository.git

# 错误信息
To https://github.com/user/repo.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'https://github.com/user/repo.git'
hint: Updates were rejected because the tip of your current branch is behind

# 方法1：先拉取再推送（推荐）
git pull origin main
# 如果有冲突，解决冲突后
git add .
git commit -m "Resolve merge conflicts"
git push origin main

# 方法2：使用rebase保持线性历史
git pull --rebase origin main
# 解决可能的冲突
git add .
git rebase --continue
git push origin main

# 方法3：强制推送（危险，慎用）
git push --force origin main
# 或更安全的强制推送
git push --force-with-lease origin main

# 错误信息
error: src refspec main does not match any
error: failed to push some refs to 'origin'

# 1. 检查当前分支
git branch

# 2. 如果没有提交，先创建初始提交
git add .
git commit -m "Initial commit"

# 3. 检查远程分支
git branch -r

# 4. 创建并推送新分支
git checkout -b main
git push -u origin main

# 5. 或者推送到现有的远程分支
git push -u origin HEAD:main

# 错误信息
fatal: The current branch main has no upstream branch.
To push the current branch and set the remote as upstream, use
    git push --set-upstream origin main

# 设置上游分支并推送
git push -u origin main
# 或
git push --set-upstream origin main

# 之后的推送就只需要
git push

# 错误信息
remote: error: File large-file.zip is 123.45 MB; this exceeds GitHub's file size limit of 100.00 MB

# 方法1：使用Git LFS
git lfs install
git lfs track "*.zip"
git lfs track "*.pdf"
git add .gitattributes
git add large-file.zip
git commit -m "Add large file with LFS"
git push origin main

# 方法2：从历史中删除大文件
git filter-branch --force --index-filter \
  'git rm --cached --ignore-unmatch large-file.zip' \
  --prune-empty --tag-name-filter cat -- --all

# 方法3：使用BFG Repo-Cleaner
java -jar bfg.jar --strip-blobs-bigger-than 100M my-repo.git
cd my-repo.git
git reflog expire --expire=now --all && git gc --prune=now --aggressive

# 文件已被跟踪，.gitignore无法忽略

# 1. 从跟踪中移除文件但保留本地文件
git rm --cached filename
git rm --cached -r directory/

# 2. 添加到.gitignore
echo "filename" >> .gitignore
echo "directory/" >> .gitignore

# 3. 提交更改
git add .gitignore
git commit -m "Remove tracked files and update .gitignore"
git push origin main

# 4. 清理所有未跟踪的被忽略文件
git clean -fX

# 错误信息
fatal: unable to access 'https://github.com/user/repo.git/': 
Failed to connect to github.com port 443: Connection timed out

# 1. 检查网络连接
ping github.com

# 2. 配置代理（如果使用代理）
git config --global http.proxy http://proxy.server:port
git config --global https.proxy https://proxy.server:port

# 3. 取消代理配置
git config --global --unset http.proxy
git config --global --unset https.proxy

# 4. 增加超时时间
git config --global http.postBuffer 524288000
git config --global http.lowSpeedLimit 0
git config --global http.lowSpeedTime 999999

# 5. 使用SSH而非HTTPS
git remote set-url origin git@github.com:username/repository.git

# 错误信息
fatal: unable to access 'https://github.com/user/repo.git/': 
SSL certificate problem: certificate verify failed

# 临时解决（不推荐用于生产）
git config --global http.sslVerify false

# 更好的解决方案：更新证书
# Ubuntu/Debian
sudo apt-get update && sudo apt-get install ca-certificates

# CentOS/RHEL
sudo yum update ca-certificates

# macOS
brew install ca-certificates

# 重新启用SSL验证
git config --global http.sslVerify true

# 错误信息
error: Your local changes to the following files would be overwritten by merge:
    file1.txt
    file2.txt
Please commit your changes or stash them before you merge.

# 方法1：提交更改
git add .
git commit -m "Save current changes"
git push origin main

# 方法2：暂存更改
git stash
git pull origin main
git push origin main
# 恢复暂存的更改
git stash pop

# 方法3：丢弃本地更改（谨慎使用）
git checkout -- .
git pull origin main
git push origin main

# 错误信息
Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.

# 1. 查看冲突文件
git status

# 2. 手动编辑冲突文件，解决冲突标记
# <<<<<<< HEAD
# 你的更改
# =======
# 远程更改
# >>>>>>> branch-name

# 3. 标记冲突已解决
git add conflicted-file.txt

# 4. 完成合并
git commit -m "Resolve merge conflict"
git push origin main

# 5. 使用合并工具
git mergetool

# 错误信息
remote: Permission to user/repo.git denied to username.
fatal: unable to access 'https://github.com/user/repo.git/': 
The requested URL returned error: 403

# 1. 检查仓库权限
# 确认你是仓库的协作者或有推送权限

# 2. 检查远程仓库URL
git remote -v

# 3. 更新远程仓库URL
git remote set-url origin https://github.com/yourusername/yourrepo.git

# 4. 使用正确的认证信息
git config user.name "Your Correct Username"
git config user.email "your.correct.email@example.com"

# 错误信息
remote: error: GH006: Protected branch update failed for refs/heads/main.

# 1. 创建功能分支
git checkout -b feature/your-feature
git push -u origin feature/your-feature

# 2. 创建Pull Request
# 在GitHub/GitLab等平台创建PR

# 3. 如果需要直接推送到保护分支（需要管理员权限）
# 临时禁用分支保护规则，推送后重新启用

#!/bin/bash
# git-push-check.sh

echo "=== Git Push 健康检查 ==="

# 检查Git版本
echo "1. Git版本:"
git --version

# 检查当前分支
echo -e "\n2. 当前分支:"
git branch

# 检查工作目录状态
echo -e "\n3. 工作目录状态:"
git status --porcelain

# 检查远程仓库
echo -e "\n4. 远程仓库:"
git remote -v

# 检查上游分支
echo -e "\n5. 上游分支:"
git branch -vv

# 检查最近的提交
echo -e "\n6. 最近的提交:"
git log --oneline -5

# 检查网络连接
echo -e "\n7. 网络连接测试:"
if git ls-remote origin &> /dev/null; then
    echo "✅ 可以连接到远程仓库"
else
    echo "❌ 无法连接到远程仓库"
fi

echo -e "\n=== 检查完成 ==="

#!/bin/bash
# auto-push.sh

set -e  # 遇到错误时退出

BRANCH=${1:-$(git branch --show-current)}
MESSAGE=${2:-"Auto commit: $(date)"}

echo "准备推送到分支: $BRANCH"

# 检查工作目录是否干净
if [[ -n $(git status --porcelain) ]]; then
    echo "发现未提交的更改，正在添加..."
    git add .
    git commit -m "$MESSAGE"
fi

# 尝试推送
echo "正在推送..."
if git push origin "$BRANCH"; then
    echo "✅ 推送成功!"
else
    echo "❌ 推送失败，尝试解决..."
    
    # 尝试拉取并合并
    if git pull --rebase origin "$BRANCH"; then
        echo "✅ 成功拉取远程更改"
        if git push origin "$BRANCH"; then
            echo "✅ 重新推送成功!"
        else
            echo "❌ 推送仍然失败，需要手动处理"
            exit 1
        fi
    else
        echo "❌ 拉取失败，可能存在冲突"
        echo "请手动解决冲突后重试"
        exit 1
    fi
fi

# 设置全局配置
git config --global push.default current
git config --global pull.rebase true
git config --global rebase.autoStash true
git config --global merge.conflictstyle diff3

# 设置别名简化操作
git config --global alias.pushf 'push --force-with-lease'
git config --global alias.pushu 'push -u origin HEAD'
git config --global alias.sync '!git pull --rebase && git push'

# 配置编辑器
git config --global core.editor "code --wait"  # VS Code
# 或
git config --global core.editor "vim"  # Vim

# 创建推送前检查脚本
# pre-push-check.sh

#!/bin/bash
echo "推送前检查清单:"

# 1. 检查代码质量
echo "1. 运行代码检查..."
# npm run lint 或其他代码检查工具

# 2. 运行测试
echo "2. 运行测试..."
# npm test 或其他测试命令

# 3. 检查敏感信息
echo "3. 检查敏感信息..."
if grep -r "password\|secret\|key" . --exclude-dir=.git --exclude-dir=node_modules; then
    echo "⚠️  发现可能的敏感信息"
    read -p "是否继续推送? (y/N): " confirm
    if [[ $confirm != [yY] ]]; then
        exit 1
    fi
fi

echo "✅ 检查通过，可以推送"

# 基本推送
git push                          # 推送当前分支到上游
git push origin main             # 推送到指定远程分支
git push -u origin feature      # 推送并设置上游分支

# 强制推送
git push --force                 # 强制推送（危险）
git push --force-with-lease      # 安全的强制推送

# 推送标签
git push --tags                  # 推送所有标签
git push origin v1.0             # 推送指定标签

# 删除远程分支/标签
git push origin --delete branch-name  # 删除远程分支
git push origin --delete tag-name     # 删除远程标签

# 推送所有分支
git push --all origin            # 推送所有分支

# 推送但跳过CI
git push -o ci.skip origin main  # GitLab
git push origin main --no-verify # 跳过Git hooks