Must use Git Bash. To overwrite local master with remote: git checkout master git fetch --all git reset --hard origin/master...
When things go wrong, for example, caused by a bad commit, we need to revert back to an earlier known...
I am bad at GIT CLI. I needed to remove a couple of commits from a branch. I did it...
There are recent commits to branch A, but the commits should have been in branch B. To fix...
There are 2 ways: Using GitHub CLI gh If local branch has the same base branch as upstream:
When we need to test a PR in github or we want to incorporate a PR, we can checkout the...
Better way is use .gitattributes, see Merge Strategies Use Case If we use an open source in our project, e.g...
Ways to Install Magento Extensions manual copy paste modman composer modgit
We use a process called pull request, or PR for short, to contribute to open source. Prerequisites
error: cannot update the ref 'refs/remotes/origin/master': unable to append to '.git/logs/refs/remotes/origin/master': Permission denied ! 1ac19fbc1e..0c0a40cfb4 master -> origin/master (unable to update...
Deprecated method. Use this instead. See also this For example, if we have an upstream remote from magento-lts, and...
Magento 1 is end of life. I want to migrate an existing Mage repo to the latest from Magento...
I wrote some code in some files in a folder called AA. I have a repo in remote in Bitbucket...
2 to 3 remote repositories in GitHub and 2 local repositories: [GitHub] Go to an owner repository (eg OpenMage...
$ git fetch origin remote: Counting objects: 201, done. remote: Compressing objects: 100% (178/178), done. fatal: The remote end hung up...
Setting your branch to exactly match the remote branch can be done in two steps: git fetch origin
I use TortoiseGit, with default options, ie, merge with ff. Applicable for hot-fixes and small features. Branch Naming
If I want to compare changes on a topic branch to master, I find it easiest and safest to do...
"git is not a deployment tool, so don't do that" http://gitolite.com/deploy.html Set up SSH keys
"A single git repository can track an arbitrary number of branches, but your working tree is associated with just one...
http://jonathannicol.com/blog/2013/11/19/automated-git-deployments-from-bitbucket/ http://symmetrycode.com/super-easy-deployment-with-git-and-bitbucket/ Bitbucket provides git hooks that can be used for code deployment. Code...
Push Git Repo Into Shared Hosting Account Like Hostgator What's required is that git client is install in the...
First, install git server in the machines. Then, install git client in local machine. After creating the remote and local...
When other made changes and push those changes to remote repository, we can pull those changes to our local repository...