git: display current merge config value
Is there a way to display the current merge config option in git without manually specifying the current branch I am in. I am wanting to do something like this:
$ git cur-merge-val
branch.current.merge = /refs/heads/current
git cur-merge-val could be some long, complicated series of git commands to which I can make an alias for -- so long as what I personally type on the command line doesn't require typing the current branch I'm in (because that seems redundant since that information should be programmatically accesible somehow).
I want to merge branch jb-mr1-release my git branch is jellybean How to merge from Android googlesource into jellybean?
I have a branch in which I've been doing some surgery on a single (Python) file, while development continues on the same file in the main branch. Normally this is easily dealt with by git merge, but o
Is there a good way to explain how to resolve merge conflicts in Git?
When merging topic branch B into A using git merge, I get some conflicts. I know all the conflicts can be solved using the version in B. I am aware of git merge -s ours. But what I want is somet
I've been using git for a few years, and every once in a while when doing a merge, git reports some bizarre conflicts. Here's an example of an .htaccess file, from when I merged in the new 7.24 releas
After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use norm
I have the following situation created a branch 'dev' worked on 'dev' worked on 'master' At some point I want to merge my work from 'dev' into master $> git checkout master $> git merge dev T
I observed that all my commits are logged in by name of administrator. Tried updating my email address and user name using git config. TTHOMAS10:rpr-mobile administrator$ git config user.name Sumit G
I have multiple branches, and I would like to merge remote changes into a branch that is not my current branch. For example: git merge remote/branch some-other-branch
How do I make git automatically run git mergetool for any merge conflict? This should apply for all merges, using merge, rebase, pull, etc.
The above is the result of merge and rebase. My question is that in the final state ,are C5 and C3' identical? Or say,git rebase is equal to git merge + remove C3?
So I have this simple file with 3 lines: some random words First Merge Test I created two different branches with the file in the original state at the top of this post from master. I create branch m
I used to work with 3-way merge tools like BC3, SourceGear, or P4 which usually show 4 components: base, left, right, and merged result. What Git seems to do, and rightly so especially in cases of a g
Say I have a feature branch, into which I merge upstream changes prior to pushing my changes back: git branch feature1 ... [edit my code] ... [commit] git fetch origin master git merge fetch_head [or
I understand that re-base is good for situations when you want to add a fix to a base branch and put it in all other branches. but it seems much more complicated than a merge(much more conflicts). Am
I've often heard it said that using git rebase reduces the number of merge conflicts as opposed to git merge, but I've never found an explanation of why this is the case. Simply replaying one set of
We've done something bad. We ran git stash save during a merge conflict, and now we can't restore our work. Things we've tried: git pull -Xours origin master git stash apply --index And: git pull or
Is it possible for git merge to ignore line-ending differences? Maybe I'm asking the wrong question ... but: I tried uisng config.crlf input but things got a bit messy and out of control, specially wh
I merge with Git and get a conflict. After having resolved the conflicts, upon commit I will see an auto-generated commit message containing a list of files which were in conflict. What is the best-pr
I had an interesting thing happen using git, wondering if anyone could explain it to me so I can understand better. When doing a merge of multiple branches (A,B), git merge A B fails as non-fast-fo
I'm developing across Windows and Linux machines/ I realized that with a git config of core.autocrlf = true, some files had their CRLFs from Windows converted to LFs in Linux. So on my Windows, in a
I want to display the hash of the current git commit in the browser so that testing team (which does not have an access to run heruko commands) will be able to include the corresponding commit hash in
I try to merge two branches, say br2 into br1 (on br1 git merge br2). 1.txt is a file which is present on both branches. In br2 this file is moved into another directory 1.txt is now in sub/1.txt. Aft
I'm trying to understand the circumstances that caused git to merge a feature branch I was working on into the main develop branch after switching to the develop branch. I was able to revert the merge
My current process is: git checkout dev make changes and commits (& push to development branch on origin occasionally) git checkout master git merge dev git push origin master git checkout dev
I set up a git alias like this: git config --global alias.popmerge '!git stash pop && git merge master' Then I call it, like this: git popmerge The git stash pop is executed, but the git
I've been digging through the git merge and rebase docs, and something isn't sinking in. I'm actively working on a project in Git, and need to share specific milestones with other developers. I want t
We ran into a strange git merge issue. We have 2 repos (simplication below). The PublicRepo is where we do most development on and every now and then we pull/merge changes into PrivateRepo. https://g
I am having trouble setting a global user name for git. When I type in git config --global user.name, I get the following error: fatal: unable to access 'H:/.config/git/config': Invalid argument I h
There is following output in git remote show git remote show origin remote origin Fetch URL: https://user@server/path Push URL: https://user@server/path HEAD branch: master Remote branch: master track
I'm trying to use command line git on os x in conjunction with araxis merge. I'd like git diff foo to open it araxis I've copied the utilties in the installer to /usr/bin $ cd /usr/bin/ $ ls | grep a
So, I have a cloned repo on my machine.(folder A). And I have another folder in which my files are updated, but it is not a git repo.(folder B). I would like to merge all files and folders from folder
Using the git config --global command to set things up, where is the file? eg : git config --global core.editor blah Its not at these places :- C:\Program Files\Git\etc\gitconfig C:\myapp\.git\conf
I have two branches in which the project is working at both tips. I merge Branch A into Branch B (git checkout BranchB; git merge BranchA), resolve conflicts, and test Branch B to find that it no long
This question may sound silly, and I am pretty much an amateur in git, but does the git merge or git pull command, creates a new branch when there are conflicts?
I know Git has tons of documentation and there are tons of posts on SO about it (I've looked at How to delete a 'git commit' and this, for example) but nothing has worked yet and I'm not sure what to
I've working with a small team using the 'merge workflow' and we recently switched over to the 'rebase workflow' as per Sandofsky's article. our current workflow: git checkout master, git pull origi
I have a master branch and a working branch_1. I want to 'move' branch_1 exactly as it is to master. So I want something like this: git checkout master git merge branch_1 # I don't know what is correc
I'm fairly new to git. Just a few minutes ago, I performed a merge on two branches; let's call them A and B. I was 'on' branch A; my next command was 'git merge B'. It said there was one conflict, but
Using the stores node in config xml - is it possible to manipulate the inherit values (i.e. the checkboxes that determine the scope of website or store value) So for example the config path for phone
I have a bunch of remote (tracking) branches that I have created local branches from (so I can write, commit and push) eg. origin/myfeature. Now I would like to merge origin/myfeature into master. I c
git pull --rebase removes unpushed merge commits. Is there a way to make it preserve them? Say my history looks like— A | \ B H | | C G | | D F | / E (A being the merge commit.) After a git pull --re
For example a have a branch I worked with for along time. And I don't longer need some code I've commited. Can I merge my branch in master and pick only those changes I need while merging, or I can on
I'm using git-tfs, and I was wondering if it is possible to merge two TFS branches using git-tfs. I have two branches $/MyCompany/Dev & $/MyCompany/Release-3.3. Release-3.3 originates from the Dev
Is there a way to resolve selected file having conflicts using p4merge in GIT? Lets say there are 25 conflicts and each conflict has to be resolved by each developer, if any developer runs 'git merget
I am on a developer branch, and I try to execute git rebase remote/a_remote_branch I see: First, rewinding head to replay your work on top of it... Applying: change #1 Failed to merge in the changes.
My colleague did a change a while back - introduced a new function - and that was (sucessfully) committed to git. Now, though, that function has gone missing. Using git log --reverse I've managed to f
For some reason, it looks like git cherry-pick pulls in other commits when flies have merge conflicts. These go away when we use git mergetool but prevent us from manually editing the merge-conflicted
We have integrated Git with Perforce merge. We invoked the p4merge and it shows 5 conflicts. I resolved only one conflict and saved the merge. When I try to re-invoke the p4merge using gitmerge tool,
Newbie Git question: I have a repo set up on bitbucket. I git fetched someone else's changes and would like to merge them with my own. However, when I try to git merge (or git merge origin/master), I