search

xforty / vagrant-drupal

Template repo for a new drupal project built on top of a vagrant vm.
Other
46 stars 11 forks source link

Wiki upstream howto results in vagrant-drupal's git history in new project #57

Closed dkingofpa closed 12 years ago

dkingofpa commented 12 years ago

HowTo: track upstream changes

After the first section of instructions, I run git log and the entire vagrant-drupal's git history up to that point is displayed. I don't think that's what we want to happen, is it? Besides, pulling upstream changes will always result in conflicts because you have to customize the Vagrantfile for each drupal project.

pearcec commented 12 years ago

You can run git log --first-parent to see only your changes local to your project. I absolutely want to pull in upstream changes. If there are improvements. I want them. Sure you might have to deal with a conflict or two. But as our files stabilize you are likely not to get a lot of conflict. Only if we change a line that you also have changed. In that case I want to know what we did, because I might want to incorporate the new change. I agree it might not be for everyone.

I am going to add some documentation to the wiki about handling conflicts. If you clone from a branch your a more likely to get a conflict when you merge in from on of our version tags.