Mediabistro Git Configuration

Configuration

Logins & workflow

ssh: [uname]@wmbdev1.iworld.com

Git repositories (web interface) l/p:email/super-basic

Git on mediabistro wiki (including basic workflow)

Repositories

After logging in with SSH repos are found at

/www/[SITENAME]/git/[USERNAME]/[SITENAME]/

E.g. if my username is dbarchowsky and I need to work on the blogs:

$ cd /www/blogs/git/dbarchowsky/blogs/

Basic workflow for a new task

Update Git repo and create new branch

• Log in with SSH.
• Navigate to the appropriate Git repo (see Repositories)
• Get latest version of code

$ git co master
$ git pull
$ git co -b tm[TASK_ID]

Make edits with NetBeans IDE

• Create a NetBeans project to download and upload local from the blogs sandbox. (This only needs to be done once.)
  • Project URL: [sandbox url] e.g. http://dbarchowsky.blogs.mediabistro.com/
  • Remote Connection: wmbdev1.iworld.com
  • See Setting up Remote Connection in NetBeans IDE
  • Upload Files: "On Save"

NetBeans remote connection settings for wmbdev1.iworld.com

NetBeans run configuration for wmbdev1.iworld.com

• Before editing files, right click on the file and select 'Download'.
• Edits will be uploaded to the sandbox with each save.
• Preview changes on the sandbox. E.g. http://dbarchowsky.blogs.mediabistro.com/tvnewser/

Checking in edits

• See "Committing changes" on the Mediabistro Wiki

$ git status -s 
$ git add [PATH]
$ git commit -m "[task title]"
$ git push origin tm[TASK_ID]

• The convention is to copy the task title from the task details and use that for the commit message.

Moving changes to preview (for review)

$ cd /www/[APPLICATION]/git/preview/
$ git fetch
$ git merge remotes/origin/tm[TASK_ID]

Now the changes will be visible at http://preview.blogs.mediabistro.com/[BLOG_TITLE]/

Documentation & release notes

• QA Links: http://preview.blogs.mediabistro.com/[BLOG_TITLE]/
• Application Changes: http://git.iworld.com/blogs/commits?ref=tm[TASK_ID]

See Also

Mediabistro Blogs Configuration