Tagged Questions
1
vote
1answer
110 views
Git Subtree Merging reports conflict when merging a simple upstream change
I'm getting started with learning subtree merging in git 1.8.2. I have created a simple example to test a change to a third party repo migrating into a main project.
I'm following the 6.7 Git Tools ...
1
vote
1answer
131 views
When does git pull cause merge between multiple branches?
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 ...
2
votes
0answers
108 views
How to tell git to ignore certain folders and files during a subtree merge?
I have master branch with the following directory structure
templates/something.lib
templates/libs/1.lib
And I also have a templates_master branch with the following files (right in the root)
...
1
vote
2answers
768 views
What is the difference between git subtree merge and git-subtree
I've just found git-subtree tool that some time ago became a part of main git repo
https://github.com/apenwarr/git-subtree/
However I don't fully understand what functionality does this tool provide ...
5
votes
1answer
1k views
Git subtree merge strategy or subtree command?
I'm starting a new Zend Framework project in which I will collaborate with a designer. I'm going to maintain this project code using git and usually designers don't speak git (or any programming ...
