16 Jul
2014
16 Jul
'14
6:44 p.m.
On 16 July 2014 17:32, Eric Niebler
I recently made a tweak to the .gitignore of the super-project on the develop branch. How do I merge that to master? The two branches have different histories, so a regular git merge balks. And when I checkout master (thinking I'll just cherry-pick), I end up with a slew of local changes (which I haven't made).
Cherry picking should work. It's hard to tell what the issue with local changes is without seeing what they actually are. Are they in submodules? You need to run 'git submodule --init' when you checkout a different branch. I sometimes use a separate checkout of the super project if I want to do something separate from the submodules. Git's quite slow at handling so many modules.