i have two branches, one more updated than other one and I want to merge into the outdated one the updated but only the commits that don't cause conflicts. When I do the merge and try to checkout the unstaged files it says 'warning: path "my file" is unmerged' and i want to merge anyways, how can i do that?
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in MERGE
- Sub-directory into independent repository and later merge back into main repository
- R: Avoid loop or row apply function
- neo4j load csv invalid "ON MATCH"
- PIG merge two lines in the log
- In SVN, what's the different between "merge from a to b" an "merge from b to a"?
- git merge "deleted by us"
- Merge sort using CUDA: efficient implementation for small input arrays
- Merge project from other branch git
- Get a single line representation for multiple close by lines clustered together in opencv
- merge or mutate a summary (dplyr)
- How to I combine data from two XML files into the same structure?
- Merging PDF files with similar names using PDFTK and a bash script
- git has problems with squashing commits once there is "Merge branch"
- How can I combine elements at the same index from separate lists?
- Merging two sorted stacks
Related Questions in UNSTAGE
- How to undo a "git add" keeping the previously staged version? (Does the index have history?)
- After a git reset --soft HEAD^ was performed, how do I remove files not needed by my repo?
- SourceTree - files marked as "Missing" in Unstaged files section - cannot get rid of them
- How to merge two similar project files together?
- Remove unstaged, uncommitted files in git when checking out a different branch
- git hook to batch unstage all files in a path
- Unstaged changes left after abrupt shut down
- git reset vs git reset HEAD
- Remove unstaged files from merge
- Visual Studio 2017 Unstaged changes vanishes after Merging from Master Branch to a release branch
- Git unstage without losing merge?
- What is the fastest way to unstage parts of a new file in git?
- I can't discard changes on visual studio git
- what happened if i rm a file without unstaging it?
- git tries to upload deleted file that is not staged
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?
Let's call your branches
outdatedandupdated. I'm assuming you want to do the merge ofupdatedintooutdatedwithout merging the conflicted files but somehow keeping yourupdatedbranch's version of them. So:Get on
outdated. Attempt the merge ofupdated.Git emits a list of conflicting files.
Write down their pathnames.
Abort the merge.
Get back on
updated. Copy the conflicting files to a place of greater safety (outside this worktree).Checkout, from
outdated, the conflicting files, thus overwriting the conflicting files inupdatedwith versions of those files that do not conflict because they are identical.Get back on
outdatedand do the merge.Get back on
updatedand copy the conflicting files back into the worktree.