Git

Learn

Git

warning: Creating default object from empty value in /var/www/vhosts/mugginsoft/site/drupal/prod/drupal-6/modules/taxonomy/taxonomy.pages.inc on line 33.

Resetting a Submodule

Posted in:

I use submodules a lot to pull in the various GitHub hosted FOSS projects that are incorporated into KosmicTask. My approach in using them is:

  1. Fork the target repo on GitHub.
  2. Make a local clone.
  3. Create a submodule in my project hierarchy that references the local clone

Converge Divergent Git Repositories

Posted in:

In GitHub we clone a repository, make changes and issue pull requests. Often the pull request is not fully merged into the upstream repository. There can be several reasons for this:

  • The upstream maintainer rejects or ignores my commits.
  • The upstream maintainer cherry picks some commits and rejects others.
  • The upstream maintainer manually updates their repository with selected commits.
Syndicate content