Someone I work with committed corrupted files to the master git branch. My local version of master branch is ahead with changes to keep, while his changes should go in the trash. I am trying to resolve this in Source Tree, I must pull his crap before I can push my stuff, and then when I try to discard them I get bunch of errors like "error: path '...' is unmerged" and "error: pathspec '...' did not match any file(s) known to git."
Git: How to discard changes that you pulled ahead of you, and let your local changes become the new branch head
87 Views Asked by user2154768 At
1
There are 1 best solutions below
Related Questions in GIT
- problem to push files on a repository git
- diff3 output in git conflict style, including mergeable hunks
- Git Not In Sync with Local Branch
- Setting up the version control of .dotfiles while the .config is connected to a forked repo
- How to fix overriding the main branch in Git?
- I can't add text to "Message" in VS Code when committing to Git
- How can i redirect pull request from main branch to another branch
- Xcode commits (possibly outside of any branch) disappeared, how to get them back?
- Git/TortoiseGit : how to apply ONLY the changes from ONE commit from branch A, to branch B?
- How can I reintroduce username an password on git using fedora?
- GIT SKIP EMPTY DIRECTORIES
- Git smudge run once per checkout or per commit?
- I can't find ~/.profile or ~/.bashrc in C:/Users/<user>/.ssh folder
- Set environment variable during push for GitHub Actions
- Android WebRTC compile
Related Questions in BITBUCKET
- Merge Request in Bitbucket: Possible to exempt a specific branch to ask for Merge Request?
- Exclude a file from merging to the main branch
- Dealing with untracked changes in git
- DevOps Preference: Point Solutions or Single Platform?
- Almost empty git repo has huge size
- Bitbucket pipeline script failure
- Bitbucket API to get the latest tag on a particular branch
- Getting connection refused to Private GKE Internal point. Autopilot private cluster
- CREATE A REPO INSIDE A REPO
- What is the correct process for merging hotfix changes into multiple release branches (ie: dev/staging)?
- Insert plotly generated interactive chart to bitbucket markdown or micorsoft sharepoint
- Installing python 3.9 in node 14
- unable to checkout or pull any branch on bitbucket nodejs
- Bit Bucket - Commits are present in history but missing in the latest file
- Bitbucket pipeline global function
Related Questions in SOURCETREE
- SourceTree: how to show every individual commit log information panel?
- How to push changes from branch A to branch B without removing new changes from B branch git (no merge)
- SourceTree not showing remote branches of a coworker
- SourceTree - Git Rebase resulting in automatic merge
- How to properly squash commits using SourceTree?
- Git: How to discard changes that you pulled ahead of you, and let your local changes become the new branch head
- sourceTree isn't letting me push to gitHub after supposedly typing my passcode wrong once
- Making a file read only in Git or SourceTree
- Files disappeared from repository, but there is no deletion in commit history
- Why after pull from origin/master, the local/master wants to push again?
- Is it possible to unstage (or reset) a file in SourceTree and, if so, how is it done?
- Git/source tree move specific commits at branch B to branch A
- Merge code using Sourcetree
- SourceTree pull error
- How can I see only changed lines in file with SmartGit?
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
From you comment, it seems you push directly to remote master. I'd suggest you create a new branch, revert that person's corrupted code; then merge your current work onto that branch, you can then push that branch.
Check the accepted answer here if it helps: How to revert Git repository to a previous commit?