what causes submodule conficts in git, and how should they be resolved?
We are using submodules and we are new to git.
We often see merge conflicts for the submodules themselves, no files are conflicted, just the submodule. There are multiple versions listed in the output of git submodule summary. We resolve them by running
git add <submodule> in the superproject.
But today we had a developer lose a commit of the submodule when she resolved the conflict in this manner.
Does running a git add choose the remote version? Shouldn't the contents of the submodule get merged? If she made changes in the submodule and committed them (which I see), then why would that commit disappear after she ran the pull and resolved the conflict?
I have a git submodule (RestKit) which I have added to my repo. I accidentally changed some files in there and I'd like to go back to the source version. In order to do that, I tried to run Mac:app-i
i've got a real fun git layout for my android project... everything has been working beautifully. the structure is essentially 1 master project with a couple inner submodules. one of the inner submodu
I'm using a few repository which I do not host myself and I thinking what if I deploy my application while they are not available? This simply just can't happen. Is there a way to freeze the submodu
I'm trying to add a submodule that already existed (different git remote repository). As I didn't searched before how to do it correctly, I think I've messed up my repository and I need some help to f
Is there some easy way to rename a git submodule directory (other than going through the entire motion of deleting it and re-adding it with a new destination name). And while we are at it, why is it
I want to remove a git submodule. I found another question that answers how to do it but I had questions about the process. In my knowledge, removing the reference from .gitmodules should remove it f
I have some git repo X that has a submodule in the subfolder foo/bar pointing to repo Y. I'm trying to get my CI system to update the submodule automatically, I mean pursuing this commands from RAKE:
What am I doing wrong here? $ git submodule foreach git pull # fails $ cd Submodules/MBProgressHUD/ $ git diff $ git checkout master $ git pull $ cd .. $ cd .. $ git submodule foreach git pull # fails
I'm using a git submodule (let's call it SubmoduleRepo) so that I can include my module in couple of projects. I can commit to SubmoduleRepo from any project that uses it. I can update, commit and pu
I thought I had it all worked out with this new project and thought that git submodules are the way to to develop and deploy my application. Set up my git repo (Drupal) and initialized it with the 7.1
I have a git repository (A) that includes a library code that I need to reuse in the second repository (B). My understanding is that git submodule does not allow to import only specific path within a
This question already has an answer here: How do I add files in Git to the path of a former submodule? 1 answer I had Git a project with other Git project inside. I finally decided to remove th
I am trying to clone a git repo that contains submodules onto a Namecheap shared server using SSH. The 'git clone' command worked fine, except that one of my submodules failed. When I try to run 'git
My project is already set and working. Some of the files are from an external project. Now, I want to use git to manage the changes of the external file from upstream. I did the following: rm <exte
I have a super-module Research that includes a submodule Simulator. When I clone Simulator repository, and do git log, I get this ~/Simulator$ git log commit abcd... Date: Feb 1....... ........ W
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 am using a new red hat os, with git version 1.7.6 (also tried 1.9.2). I also have a debian 6 machine with git 1.7.6. When I create a clone and populate a submodule on the debian machine, the submodu
Solution: remove --cached from git rm -r --cached submodule/name. Scripted for reference. I'm trying to remove a git submodule based on this SO answer, but the submodule is not being removed. I add th
I am not doing changes to the submodule and it keeps making problems every time I am merging or committing. Is there a way to ignore that ?
When I roll back my git working directory to a particular commit, the submodule shows as modified. The submodule is checked in and has no modified files, but it's at different commit than it needs t
When I run git submodule update No submodule mapping found in .gitmodules for path 'Classes/lib/AFKissXMLRequestOperation' But I have no submodule Classes/lib/AFKissXMLRequestOperation in current rep
I have a git project which contains some files copied from another git project. Now I want to convert those files into a git submodule. Can I do that without losing the history of the changes I alread
I am a C# developer and trying to figure out Git. It's a much different environment than what I am used to in a centralized VCS (I am very comfortable with TFS). I've watch some excellent Pluralsight
i have a project where i include 2 submodules from git. Both projects have nuget package restore enabled, the parent project too. The package folder in the two included submodules is not checked in,
How would I go about adding a git submodule for a specific tag or commit?
I am not able to clone the submodule existing within my private git repository. I do have access to entire repository, Have used the below commands but dint work, please help what is the right way to
I have moved subdirectory in separate repository and then included it as submodule. Now I want to rebase another branch on top of that change. israfel:proj almad$ git rebase -i origin/master error: co
I'm using the git superproject pattern in a large project which is deployed by a Teamcity build agent which does not have a repository account, however the repository is set up to allow anonymous clon
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
My project struture ProjectA -FrameworkA (submodule) --Twig (submodule of FrameworkA) How I can update submodule recursive? I already tried some git commands (on ProjectA root) git submodule foreach
I have a bunch of videos inside a directory named videos. I committed that unfortunately large folder to git, causing git to become very slow for some activities such as cloning. So I did some resea
here is the situation i faced. I have a repo containing a submodule. In the repo, i created a new branch to do some editing. Then i found out i need an updated submodule, so i pulled down the submodu
I've create a submodule in my repository root in a specific folder. I can see the submodule is well registered in .git/.gitmodules and in .gitmodules, but I can't get it working. I can't see it if I m
Being a relative submodules noob, I wanted to update my submodule with from its origin, and did: git pull This resulted in: remote: Counting objects: 111, done. remote: Compressing objects: 100% (3/3
My webapp is written in Ruby on Rails. I'm new to git and want to know what kind of files should I include in the project. Please mention what files should I push into git projects.
How can I create a directory link that will survive git submodule update? Given the following example directory structure: proj |-- lib3 | `-- submod | `-- lib `-- lib I created a soft link from proj
I've added a submodule in my main git folder tree and haven't changed anything but it's showing up modified. What do I do about this? $ git status # On branch master # Changed but not updated: # (use
I'm getting a hang of git submodule (wishful thinking?) and I'm coming up with more specific questions, which is a good sign... I've tried to find the which revision of the submodule the superproject
I have two bare repos super and a, one clone of super - clone_super and one clone of a - clone_a. I've added repo a as a submodule in clone_super. If I now make some changes in clone_a, push those and
Which SCM technology should I use? Subversion or Git? Also, if SVN, which plugin is better for Eclipse and if Git, what is the best plugin. Thanks.
I've tried merging two branches on my Git repository and some conflicts occurred on my Storyboard file. Here are the conflicted lines: <resources> <image name=IconAddToCart width=30 heig
Initially I had the following (simplified) repo structure: MyRepo external1/MySub (git submodule) .gitsubmodules Where $ cat .gitsubmodules [submodule external1/MySub] path = external1/MySub url =
I'm a bit confused by git rebase. I have a develop branch and a staging branch. I've merged develop into staging git checkout staging git merge develop But there are a bunch of duplicate commits beca
I am attempting to add a few submodules to my .vim/bundles directory, and when I attempt to add this particular repo Git gives me a strange error I've never seen before: $ git submodule add -f git://g
I have (hopefully) a relatively simple git question, but I'm a git newbie and don't understand all the vocabulary. I am trying to update R2D3 to the latest version of D3.js. The repo's owner has said
I'm trying to get TravisCI to automatically deploy my Hakyll static site, according to this guide. Here's how my repo is set up. I have my source branch, which contains my hakyll and markdown files. I
being new to git, I have this dumb question - what is the correct way of using feature-branches ? From what I have gathered, this is how I thought it should be used: got some 'develop' branch from whi
How do I get rid of submodules when switching branches. I do not understand why git clean says it removed the submodule but does not. Is this a bug? Below are cut&paste steps to reproduce. git --v
What is the best practice with versioning projects with multiple 3rd party libraries in git or other DVSC? Should the project source code be mixed with libraries in the same repository, or should they
Why after git rebase should do : git add changedfile? More explanation for my Question: add command taking file to staging not commit him What git rebase --continue doing? Thanks