git-merge

问题 Is it possible to undo the git abort. Scenario is that I was merging two branches when run command git merge its shows an error message you have uncommitted changes, therefor I run git commit now message appears "fatal error there is a merge conflict between, abort the operations to resolve the issue", so I run the command git merge --abort . After this i lost my local code changes too. Is there any solution to undo abort or get my local code back. 回答1: No, unfortunately if you didn't commit

问题 Is it correct to say that «push» is kinda «merge»? The only difference, that I see: «merge» is operation on my local branches, «push» is operation between local and remote branch. Is my understanding right or not? 回答1: git pull is an alias to git fetch + git merge . git fetch updates your local repository with the changes (delta) which are downloaded from the remote repository and stored inside your local .git folder. Once the fetch is over and you have all the data locally, then git merge

问题 This is an annoying one. I use this command to merge two branches git checkout -b temp public/master git merge -Xtheirs --squash -m "squashed with devtemp" devtemp I get some conflicts: CONFLICT (rename/delete): public/github.css deleted in devtemp and renamed in HEAD. Version HEAD of public/github.css left in tree. Removing public/extra-html/exit-codes.html Removing public/.gitkeep Auto-merging package.json Squash commit -- not updating HEAD Automatic merge failed; fix conflicts and then

问题 I want to set trustExitCode to false and keepTemporaries to true but it does not work... I don't underestand why. Here is my ~/.gitconfig : [merge] conflictstyle = diff3 tool = p4merge [mergetool] keepTemporaries = true keepBackup = true trustExitCode = false [mergetool "p4merge"] trustExitCode = false keepTemporaries = true [mergetool "mymeld"] cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE trustExitCode = false keepTemporaries = true [mergetool "myp4merge"

问题 I'm working on a test script and trying to reproduce git merge conflict DD when shown via "git status --short". I've seen this conflict type in the past. DD (unmerged, both deleted) I keep coming up with no conflict with everything I try. What steps do I need to perform to generate "DD" conflict? What does a "DD" conflict mean? I saw this: Git: how to create different unmerged states? But the steps listed there no longer produce any conflicts in later versions of Git. 回答1: Found a link to

问题 This question is inspired by the following excellent post: https://blogs.msdn.microsoft.com/oldnewthing/20180312-00/?p=98215 https://blogs.msdn.microsoft.com/oldnewthing/20180313-00/?p=98225 https://blogs.msdn.microsoft.com/oldnewthing/20180314-00/?p=98235 This post explains why cherry picking is evil and how it can be replaced with partial merge. Here is the picture: Its meaning is that if we need to make a change in the feature branch that will have to also be in the master branch, we do it

问题 I am using git to track a large LaTeX document which I write using Kile on different machines. Kile writes to its .kilepr config file when closing Kile. The problem I often run into is that I commit before closing Kile. So I commit and push, work on the other machine, and when I come back and want to pull I get a merge conflict because the .kilepr file contains the cursor position (which obviously changed now). My question: Is there a way to add a merge rule to git config for a specific file

问题 in a custom merge driver I need to get the full path of the conflicting file. Git provides only temporary files located at the root of the repository. Is there any way to ask Git what file it is trying to merge at the moment? Any git command that provides this information during the merge? UPDATE: I mailed to the Git mailing list. At the moment there is no option but my suggestion of an additional Parameter %P (path) may be implemented today. UPDATE 2015-06-05: My request has been added to

问题 I'm working with a repository where a merge was performed weeks ago which we just discovered used the --strategy=ours flag (it was supposed to use the --strategy-option=ours flag), thus not applying any changes to HEAD. However, we need to have the changes applied. Git already recognizes the branch as being merged and the commits in the history of the branch. This sort of merge can't be reverted using git revert -m ... What would be the proper way of reverting and/or re-applying the merge to

问题 Let's say I am on a different branch than <local-branch> , called <different-branch> . When I try to pull from a remote branch to a local branch, I do the following: git pull origin <remote-branch>:<local-branch> And, from my understanding this should pull into my <local-branch> , and not pull into <different-branch> . But, then when I check git log while I'm on <different-branch> , I see that those commits are from <remote-branch> ? How do I pull from a remote branch, into a local branch,