When is it recommended to use git rebase vs. git merge?
Do I still need to merge after a successful rebase?
Answer: Short Version
Merge takes all the changes in one branch and merge them into another branch in one commit.
Rebase says I want the point at which I branched to move to a new starting point
So when do you use either one?
Merge
Let’s say you have created a branch for the purpose of developing a single feature. When you want to bring those changes back to master, you probably want merge (you don’t care about maintaining all of the interim commits).
Rebase
A second scenario would be if you started doing some development and then another developer made an unrelated change. You probably want to pull and then rebase to base your changes from the current version from the repo.
Assuming your date column is an actual MySQL date column:
SELECT * FROM jokes WHERE date > DATE_SUB(NOW(), INTERVAL 1 DAY) ORDER BY score DESC;
SELECT * FROM jokes WHERE date > DATE_SUB(NOW(), INTERVAL 1 WEEK) ORDER BY score DESC;
SELECT * FROM jokes WHERE date > DATE_SUB(NOW(), INTERVAL 1 MONTH) ORDER BY score DESC;
This article focuses on how to simply and efficiently converse with Envato’s API in order to verify the authors’ customers’ purchase codes in the author’s own applications. I talk through all the steps to set up this function, covering how to create the unique API key required, using the PHP cURL function and interpreting the output.
It’s rather easy but you have to ensure that your site is based on some master repo that can be merged down the stream with earlier versions (repo that has all Magento versions as tags or branches that can be merged to latest from first). So here’s two scenarios to follow
1. My site is not in git
start by cloning from master repo that has all magento versions (at least to the version you are currently using)
get your clone and checkout new branch with the version you are currently using
copy over your current site to this version
after that done “git status” will show you the diff with original version you started with and all the edits you have made to it
its now smart to move all core edits to local codepool and revert any changes in core to original files, move any edts in default or base templates to your own template and revert changes in default or base template files. Same goes with all the files that look modified against the original version. This gives you “all my changes are separate from original code and they will not conflict my upgrades”, it’s wise to commit this state
If all things are separated from original files then it’s time to upgrade. Turn on default theme, disable all local and community extensions , merge the new version with your current branch. Visit the site to perform the upgrade
Now your site is upgraded and you can turn on your theme and custom extensions one by one to see what is compatible and what not. Debug and solve one by one
My site is already in git
if it is based on repo that has all versions you are in good condition (skip 2)
if it’s not then you can add some repo that has it all as your remote and start with merging your current version and separating changes from original like described in first scenario
make a new branch of your current site used
merge with new version
disable all local, community extensions, turn on default theme, and upgrade
enable theme, extensions one by one and debug where conflicts happen
It’s common to have a git setup like follows:
MAGENTO MASTER -> REMOTE ORIGN THAT HAS ALL MAGENTO VERSIONS
YOUR MASTER -> REMOTE ORIGIN IS MAGENTO MASTER
branch: yoursite_dev
branch: yoursite_stage
branch: yoursite_live
You always develop on your_dev branch andif changes are ready for evaluation you merge _stage with _dev and if changes are approved you merge the state to _live either from _dev or from _stage.
commands based on theoretical endpoints
git clone git://github.com/speedupmate/Magento-CE-Mirror.git yourprojectdir
cd yourprojectdir
git fetch --tags
git tag
git checkout -b yoursite_dev magento-1.5.0.1
git checkout -b yoursite_stage yoursite_dev
git checkout -b yoursite_live yoursite_dev
git checkout yoursite_dev
git branch
//copy in your site
//separate changes or originals
//add any file/dir with local importance to .gitignore
//turn of your default theme, disable all local/community extensions and overrides
//assuming you are on dev branch commit your clean state
git merge magento-1.6.0.0
//visit the site to execute the upgrade
//enable your theme , extensions , debug
this gives you a starting point for scenario 1 and after that you could just copy in your site and start separating changes and making order in your current site and themes.
Use PayPal to send and receive money worldwide. With over 230 million accounts worldwide and growing, we help you securely, easily and quickly pay and get paid locally and across borders.
This PHP script checks if a string $color is a hex color or not. The second IF statement will add the pound symbol at the beginning if it is missing from the hex color value.
//Check for a hex color string '#c1c2b4'
if(preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
{
//Verified hex color
}
//Check for a hex color string without hash 'c1c2b4'
elseif(preg_match('/^[a-f0-9]{6}$/i', $color)) //hex color is valid
{
$fix_color = '#' . $color;
}
Recent Comments