Editing Mediabistro Git Configuration (section)

==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|Repositories]])
* Get latest version of code
<syntaxhighlight lang="bash">
$ git co master
$ git pull
$ git co -b tm[TASK_ID]
</syntaxhighlight>

=== 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. <code>http://dbarchowsky.blogs.mediabistro.com/</code>
** Remote Connection: <code>wmbdev1.iworld.com</code>
** See [[Git_Workflow#Netbeans|Setting up Remote Connection in NetBeans IDE]]
** Upload Files: "On Save"
[[file:Netbeans-wmbdev1-settings.png|thumb|NetBeans remote connection settings for wmbdev1.iworld.com]] [[file:Netbeans-wmbdev1-run-configuration.png|thumb|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 [http://wiki.mediabistro.net/index.php?title=Git#Committing_changes|"Committing changes" on the Mediabistro Wiki]
<syntaxhighlight lang="bash">
$ git status -s 
$ git add [PATH]
$ git commit -m "[task title]"
$ git push origin tm[TASK_ID]
</syntaxhighlight>
* 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)===
<syntaxhighlight lang="bash">
$ cd /www/[APPLICATION]/git/preview/
$ git fetch
$ git merge remotes/origin/tm[TASK_ID]
</syntaxhighlight>

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

=== Documentation & release notes ===
* QA Links: <code><nowiki>http://preview.blogs.mediabistro.com/[BLOG_TITLE]/</nowiki></code>
* Application Changes: <code><nowiki>http://git.iworld.com/blogs/commits?ref=tm[TASK_ID]</nowiki></code>