Git merge doesn't report submodule changes
I have a project with 2 branches called master and production. These 2 branches have a dependency included in the submodule plugin1. In master plugin1 points to the latest revision (rev2), whereas the production branch points to the previous commit (rev1).
When I merge master into production, I expect to have a production branch that now points to the revision rev2, but it doesn't. Is there an option to do that, or do I have to manually report the changes in the production branch?
I have a git submodule in my main git repo. As I understand it, the main repo stores a SHA value (somewhere...), pointing to the specific commit of the submodule that it is linked to. I went in to
I have two branches and want to cherry-pick a change from one and move it to the other. At a later date, when I merge the two repositories what effect will the cherry-pick have since the commit IDs wi
How can I merge this submodule after having had the following warning? warning: Failed to merge submodule sites/all/modules/contrib/panelizer (not checked out)
How can I config Git to use p4Merge as my mergetool? Next is my current situation: $ git --version git version 1.8.3.msysgit.0 $ git mergetool This message is displayed because 'merge.tool' is not con
Let's assume you are merging one branch in Git to another one(no fast forward of course). And you don't have conflicts, so the merge should be successful, without interruptions. But by some reasons yo
Source Tree is as follows: core // root .gitmodules // this has box-sdk as submodule box-sdk // git submodule BoxJavaLibraryV2 // Box related files I also created settings.gradle include 'box-sdk:Box
Background Using Git 18.104.22.168 on Linux. The repository looks as follows: master book The submodule was created as follows: $ cd /path/to/master $ git submodule add https://email@example.com/user/repo
Ok, we have a repository with 3 submodules. Now we want to merge this submodules back into main repository, keeping all history (well, using submodules turned out to be more headache than being useful
How would I go about adding a git submodule for a specific tag or commit?
So I am fairly new to the whole git topic. But what I am trying to do is syncing my dotfiles across multiple machines. I know there are plenty of tutorials out there and I got the basic concept. But m
i want to update my submodule on my local machine to the latest revision of the super repository. currently i have git submodule status 257a40757014ca5a2e8b500d2eb3000cb6628094 common (heads/master)
I love git submodules. Also, I hate git submodules. What I love about them is how it enables to you to cleanly compartmentalize dependencies etc. I get the point of having them point to a specific com
I'm looking for a very useful feature that could make my day, I searched but found nothing. I am working on a very big project under GIT (SourceTree), I made lot of changes to different source files p
I get stumped when git diff other_branch shows differences and git merge other_branch does nothing. What's the right way to incorporate that missing code into my_branch? This SO answer diagramed a s
I have a git repo and I want to add a submodule to it. Problem is, the submodule exists as a folder inside another repo. Can I add only that folder as a submodule?
I have two git identities, one is a personal one and the other is for my employer. My work project uses a submodule and although I can clone the main repo fine, I am not able to update the submodule.
So far, I've been publishing a site to Windows Azure Websites via Git without any problems. But today we added a submodule to our project and Azure didn't seem to like working with submodules. The bui
Maybe this has been answered before, but I can't seem to find it. Let me illustrate my problem. I checked out a git repository and then done some modifications to the files. This has been some time ag
When you have merge conflicts in git, they appear in the file like this: <<<< old old ==== new new >>>> Now, I have some changes on origin/master I am going to merge into my l
So I started using Git a few days ago. ( Very late to the party - don't scold :) ). Really starting to get comfortable with the basic commands, ideas and workflows. However, submodules are really taki
I just did: git reset --merge and I lost my latest modifications to some files, how do I undo this last action?
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 have a git repo with one submodule. I used the method described here to connect them. Now, I'd like to use filter-branch to check out a specific revision from the submodule for each revision of the
I have a project that contains many submodules. I want to loop over each submodule with the following command: git submodule foreach npm install And I want the script to continue looping over each sub
after creating a git submodule by typing git submodule add <repo> && git submodule init my .git/config is changed, as well as a new file .gitmodules is created. It seems that I would be
How do I un-submodule a git submodule (bring all the code back into the core) ? As in how should I, as in Best procedure ...
I have cloned a repo that includes a submodule. I know that running git submodule init inserts a reference to the submodule into .git/config, and that running git submodule update pulls the files from
I have a git repository with Android kernel v3.0.36. But now, Linux 3.0.38 is out. Android and mainline Linux are incompatible, so I just want to pull the changes from 3.0.37 and 3.0.38 (just a small
According to the documentation on git, a git pull will perform a fetch of the current branch and then run a git merge to merge the changes. After a colleague committed and pushed his changes to the se
I am working in a submodule and am having trouble untracking a folder full of files $ git status # On branch master # Changes not staged for commit: # (use git add <file>... to update what wi
I have a project that used to contain a submodule, at path mysubmodule. I installed the latest Git from source (1.8.3-rc2) and ran git submodule deinit mysubmodule. I then deleted the .gitmodules file
Overview: $ git pull ... time passes ... $ git checkout topic # remote topic $ git checkout master $ git merge topic $ git push non-fast-forward updates were rejected $ git pull merge by rebase $ git
I am adding a submodule to my project which contains another git repo. To get the module I ran: git submodule add git://github.com/biakaveron/debug-toolbar.git modules/debug-toolbar Then ran: git sub
I have a git project P. Within my project P is a submodule Q that was cloned off a 3rd party library's master branch. P | - src - Vendor | - Q I do not have permission to make push any changes to the
In Git, during a merge, is there a way that we can tell to discard what ever local changes present (or previous commit) and apply the merge. I mean if there is a way,then we can do merges like branch
Judging just from the number of results for git submodule here on SO alone, this is clearly a commonly asked and easily confused topic, so I will try to be as precise as possible. Forgetting everyth
Let's assume that we've got some git submodule in directory submod. Now I'm doing such commands: # git submodule update --init submod # cd submod # git branch * (no branch) master If submodule loca
There is a branch on a 3rd party repo that I want to add as a subdirectory of my repo. I want to be able to make changes to that 3rd party code, maintain those changes in my repo, and still be able to
I changed the commit pointer of a git submodule: % git status # On branch fix # Your branch is behind 'origin/fix' by 1 commit, and can be fast-forwarded. # # Changes not staged for commit: # (use gi
CONTEXT: I am preparing a big C# merge using visual studio 2008 and TFS. I need to create a report with the files and the number of collisions (total changes and conflicts) for each file (and in total
I am new to git but have spent a good deal of time reading through documentation and gotchas on git submodules before trying them. I am having a problem that I feel -- probably naively -- is a bug in
We are moving our (huge) project to git and we are thinking about using submodules. Our plan is to have three different heads in the superproject: release,stable,latest. The project leads will handle
We have port 9418 blocked here so I can't seem to clone with git://xyz.git Is there a way to make git use HTTP instead? If I do it manually it works but when I run git submodule update it always want
Assuming you have this: master: o--o--o development: `o--o--o I want to merge the changes back as one commit (avoiding all the junk commits along the way): git checkout master git merge --squash dev
I've one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the commit level instead of the file/directory level. One of the side effects is that you
The structure of my project is: I added RestKit as submodule. When I run git submodule update -i I get an error: fatal: reference is not a tree: da5895a5e0d1f827ccc0b94a0fe51f385875b4f8 Unable to che
I created a git submodule and pushed it onto our main repository. This worked fine and I can see the submodule in the repository via a browser. To test it works fine, I tried to get the source is a f
I realize you can set the depth of a submodule manually when updating it, see here, but is it possible to set that automatically, say as an option in the gitconfig? This way I could set it so when upd
Where does the super-repo keep track of what commit each submodule is at? I dont see any of that info in .gitmodules What I want to achieve is if I tag the super-repo, with say 1.0-alpha, then it
I accidentally checked in a wrong submodule update: ( as part of a bigger commit ) -Subproject commit 025ffc +Subproject commit f59250 It is already pushed to the remote.. How do I undo this update?