Jaron Swab jrswab

## Update-branch.md

      
              1 file
            
          
              64 forks
            
          
              29 comments
            
          
              283 stars
            
          
                santisbon
                / Update-branch.md
            
            
              Last active
              March 21, 2024 15:50
            
              
                Deploying from #Git branches adds flexibility. Bring your feature branch up to date with master and deploy it to make sure everything works. If everything looks good the branch can be merged. Otherwise, you can deploy your master branch to return production to its stable state.
              
          
    Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)
$ git checkout master
Fetch the remote, bringing the branches and their commits from the remote repository.
You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master.


## starttmux.sh
#!/bin/sh
#
# Setup a work space called `work` with two windows
# first window has 3 panes.
# The first pane set at 65%, split horizontally, set to api root and running vim
# pane 2 is split at 25% and running redis-server
# pane 3 is set to api root and bash prompt.
# note: `api` aliased to `cd ~/path/to/work`
#
session="work"
	#!/bin/sh
	#
	# Setup a work space called `work` with two windows
	# first window has 3 panes.
	# The first pane set at 65%, split horizontally, set to api root and running vim
	# pane 2 is split at 25% and running redis-server
	# pane 3 is set to api root and bash prompt.
	# note: `api` aliased to `cd ~/path/to/work`
	#
	session="work"