I forgot to git pull my code before editing it; when I committed the new code and tried to push, I got the error “push is not possible”. At that point I did a git pull which made some files with conflict highlighted. I removed the conflicts but I don’t know what to do from … Read more
In a larger git merge with several conflicting files, I incorrectly marked a file as resolved (using git add FILE after some editing) Now I’d like to undo my conflict resolution attempt and start over resolving that file. How can I do that? 1 Answer 1
I have 2 git branches branch1 and branch2 and I want to merge file.py in branch2 into file.py in branch1 and only that file. In essence I just want to work on the file.py in branch1 but want to take advantage of the merge command. What is the best way to do this? 13 Answers … Read more
I have create a dialog branch and when I try to merge it to master branch. There are 2 conflicts. I don’t know how to resolve CONFLICT (delete/modify). Can you please tell me what to do? $ git checkout master $ git merge dialog CONFLICT (delete/modify): res/layout/dialog_item.xml deleted in dialog and modified in HEAD. Version … Read more
Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of Git and KDiff3. When I make a merge and have conflicts, I run the following command: git mergetool Then I receive the message: … Read more
I have run into a bit of a problem here: I had a problem-specific branch 28s in Git, that I merged in the general develop branch. Turns out I had done it too fast, so I used git-revert to undo the merge. Now, however, the time has come to merge 28s into develop, but git-merge … Read more
I have a Git repository with many branches, some of them already merged and some not. Since the number of branches is quite large, how can I determine which branches have not yet been merged? I would like to avoid having to do an “octopus” merge and re-merging branches that have already been merged. 4 … Read more
I have a git branch called 9-sign-in-out with perfectly working code, and I want to turn it into the master. I’m currently on the master branch. $ git branch 9-sign-in-out * master I’m trying to switch to 9-sign-in-out branch, but it doesn’t allow me to: $ git checkout 9-sign-in-out app/helpers/application_helper.rb: needs merge config/routes.rb: needs merge … Read more
I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also). When I commit the resolved file with git commit file.php -m “message” I get the error: fatal: cannot do a partial commit during a merge. I had the same issue before and … Read more
I have two branches, email and staging. staging is the latest one and I no longer need the old changes in email branch, yet I don’t want to delete them. So I just want to dump all the contents of staging into email so that they both point to the same commit. Is that possible? … Read more
