简体繁体中英

Git merging branch issue

原文 2022-07-12 11:48:03 5 1 git/ git-merge/ git-branch

When I try to merge dev branch to the master branch, I got the following error.

error: The following untracked working tree files would be overwritten by merge:
test.py
Please move or remove them before you merge.

Does that mean I should manually remove the test.py file in the master branch before merging? How should I handle it?

Thank you in advance!

1 answers

您可能应该在合并之前在 test.py 中提交您的更改

A stubborn issue with git branch merging

Merging issue with git pull origin production to a branch

Git Branch Merging Mistake

git branch merging details

Git Merging Branch Into Master

Merging Branch using Git

git branch and merging

Force merging in a branch in git

Merging the changes into the branch - git

GIT branch not merging

暂无

暂无

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

Related Question A stubborn issue with git branch merging Merging issue with git pull origin production to a branch Git Branch Merging Mistake git branch merging details Git Merging Branch Into Master Merging Branch using Git git branch and merging Force merging in a branch in git Merging the changes into the branch - git GIT branch not merging

Related Tags

粤ICP备18138465号 © 2020-2024 STACKOOM.COM