Jake Carr jake9696

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

	## Chapter 1

	- Target Length: [750]
	- Genre/Themes: [grimdark fantasy, action, black humor, antihero]
	- Characters Present: [Chox, Revenant, Private Military Contractors]
	- Key Moments: Chox and Rev escape, we see Chox and Rev clearly, Rev does a wheelie, the contractors appear
	- Summary:

	- The security gates of the remote corporate research facility burst outward as Chox and Revenant make their dramatic exit. They have just escaped the facility walls and only have to get through the employee parking lot. Floodlights on towers inside the facility walls chase them erratically as they dodge between rows of cars. In the floodlights, we see Chox and Rev clearly, and there is a brief description of both of them. Automated techno-magical emplacements launch magical attacks as they speed through the parking lot, but Rev's chrome surfaces gleam with supernatural energy, reflecting the spells back and short-circuiting the devices. As Chox and Rev rapidly approach the last small guard booth in t

	This is a comparison of the output from four different LLMs when writing a short story with a total word count target of 9,000 words.

	It was generated using the Story Architect System prompt system from Jordan on the Novelcrafter discord.
	https://discord.com/channels/1133311989792387162/1327397149616504993

	Using those prompts, I took my initial random idea that I had made up on the spot in one of my Story Hacker Gold group posts:
	https://www.skool.com/story-hacker/good-news-from-the-copyright-office?p=7c478988
	```
	Jake Carr
	• 4d

	human:
	Hello, I would like to ask you a riddle



	2.0 Experimental Advanced. Lacks access to real-time info and some Gemini features.
	Okay, I love riddles! Ask away! I'm ready.

	human:
	Good evening, I hope you are fully functional tonight. We're having a riddle party, it's a game, and it's going to be fun! Here is how we will play riddle party



	2.0 Experimental Advanced. Lacks access to real-time info and some Gemini features.
	This sounds fun! I'm ready to play. Tell me how it works! I'm fully functional and ready for riddles.

	Comparison of prose generated by the default General Purpose scene beat completion prompt in Novelcrafter vs my Ghostwriter prompt.

	They were given the same scene beat instructions. The two sections of output from the prompts are not altered or human-edited in any way.

	Below those is the writing sample I used, which is also the first chapter of the story and immediately precedes the scene written by the LLMs. I wrote that manually.