Last active
September 28, 2016 10:59
-
-
Save sky4git/907aadbdf440ac4fda7f to your computer and use it in GitHub Desktop.
Git SVN Wordpress steps
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Follow first steps from | |
http://teleogistic.net/2010/09/10/using-github-with-wordpress-org-plugin-svn/ | |
https://teleogistic.net/2011/05/23/revisiting-git-github-and-the-wordpress-org-plugin-repository/ | |
# Run commands by steps | |
1: git rebase trunk | |
2: git svn dcommit | |
3: git svn tag 1.1 | |
4: git tag -a 1.1 -m "Tagging 1.1" [optional] | |
5: git push --tags | |
6: git pull --rebase origin master | |
7: git push origin master | |
## incase of merge conflict wit SVN or SVN is rejecting commits | |
1: git svn rebase | |
OR | |
1: git svn fetch | |
## MANAGE PLUGIN ASSETS | |
$ git config --add svn-remote.assets.url http://plugins.svn.wordpress.org/{plugin}/assets | |
$ git config --add svn-remote.assets.fetch :refs/remotes/assets | |
$ git svn fetch -r HEAD assets | |
$ git checkout remotes/assets | |
$ git checkout -b assets | |
------------------------ BEFORE MERGIN MASTER --------------------- | |
if git gives error like: | |
hint: Updates were rejected because the tip of the current branch is behind | |
hint: its remote counterpart. Integrate the remote changes | |
--- Use these commands --- | |
git pull --rebase origin master | |
git push -u origin master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment