When you run git submodule update --remote in a container repo, you might notice that it says:
Submodule funny_module bf722acd..02dc481d (rewind):
< That awful bugfixWhy the rewind?!
Continue readingCategory Archives: Git
How to Merge When master is Not The Base Branch
If the base branch for your repository is not the default master, you might have encountered this bizarre Pull Request problem when you try to deploy from base branch onto master:
Interactive Git Commands Cheatsheet
I found this link in one of StackOverflow answers–very useful in understanding how git works.
Git Submodule Life-Saving Setup
What’s the use of git submodules? It’s mostly useful when you want to work on the code in both the main repo and the sub repo at the same time. Otherwise, a normal dependency management system would suffice.
To have submodules safely set up so that you run into walls less often, do the following:
Continue readingHow to Auto-Deploy to Server on Git Push
Goal:
- If
git pushonmasterbranch - Then sync files onto server and deploy (e.g., running
yarn run buildor any other scripts)
I’m on DigitalOcean’s server, but this works on any self hosted servers.
Continue readingReference: How to Git Stash
To save the uncommitted changes:
# Either without a name $ git stash # Or with a stash name: $ git stash save funny-stash