WordPress.org
Get WordPress

Plugin Directory

Changeset 1399270


Ignore:
Timestamp:
04/19/2016 11:41:23 AM (10 years ago)
Author:
robmcvey
Message:

Update readme for new work flow part 1

File:
1 edited

Legend:

Unmodified
Added
Removed

  • copify/trunk/README.md

    r1003788 r1399270  
    2727We want to use git for version control, but WordPress uses SVN. Urgh.
    2828
    29 We can get around this by using two local branches, `master` and `svn`.
     29So, initialise the SVN repo locally using `git svn`:
    3030
    31 When creating the `svn` branch locally, we set a different remote;
    32 
    33 `git checkout -b svn remotes/git-svn`
     31`git svn init --stdlayout https://plugins.svn.wordpress.org/copify`
    3432
    3533Development can be carried out on any branch other than `svn` then when we want to publish our changes to WordPress, we merge using the `--squash` option;
    … …  
    4341```bash
    44421 Squashed commit of the following:
    45 2 
     432
    46443 commit bc314d4aec1ce5a69eaea06e601943f0cfe06eaf
    47454 Merge: b09a9b4 17a8ef7
    … …  
    6462...
    6563```
    66 
    67 
    68 
    69 
Note: See TracChangeset for help on using the changeset viewer.