Reputation: 8336
how to get new version from git/sourcetree even if I have local changes?
My local changes should not conflict in any way, but still I get:
error: Your local changes to the following files would be overwritten by merge: ExampleApp/ExampleApp.cs ExampleApp/ExampleApp.csproj SharedCode/SharedCode.csproj Please, commit your changes or stash them before you can merge.
when I try to Pull.
I just want them merged automatically, or in case of conflict do manual merge.
EDIT: my changes should not be in version control. at least not for others to see.
Upvotes: 1
Views: 2089
Answers (2)
Reputation: 4660
git checkout -b temp_branch
git add -A
git commit -m 'wip'
git fetch origin
git pull --rebase origin/master
- click "Branch" button,
- create a new Branch
- click "Commit" button,
- select all "Unstaged files" and write some commit msg.
- "commit"
- checkout master branch by double clicking the branch name on the sidebar
- pull
Upvotes: 1
Reputation: 49
Why don't you go to your repository location, browse through the commits, and see which are the files giving you a conflict? Then you can take a backup of the files giving you conflicts, and then merge your changes, maybe using WinMerge.
Upvotes: 0
Related Questions
- How do I undo the most recent local commits in Git?
- How do I get the current branch name in Git?
- How do I discard unstaged changes in Git?
- How do I force "git pull" to overwrite local files?
- How do I push a new local branch to a remote Git repository and track it too?
- How do I remove local (untracked) files from the current Git working tree?
- How can I rename a local Git branch?
- How to determine the URL that a local Git repository was originally cloned from
- Remove a file from a Git repository without deleting it from the local filesystem
- How do I ignore an error on 'git pull' about my local changes would be overwritten by merge?