Databases
StackOverflow2013
Postsdbo
POIs it possible to overwrite a branch instead of merging it in Git?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POIs it possible to overwrite a branch instead of merging it in Git?
    primarykey
    data
    text
    <p>I've been learning git on a need to know basis over the last several months as I've been using it; I skimmed the Git Pro book but haven't had time to spend on getting to understanding the intricacies yet. </p> <p>I read an article about having what they call a "floating branch". Which contains the config changes necessary on the production server. So my work-flow is I finish writing and testing a new feature on my development server, then push to a new branch over to the production server, checkout that new branch, then merge the so called "floating branch" config branch &amp; then rebuild the source &amp; restart the server. </p> <p>If anything unexpected happens I can quickly checkout the last functioning branch &amp; then rebuild the source &amp; restart the server, reducing production downtime. </p> <p>Obviously this is a messy work-flow, since the production server's ends up with a new branch for every update. It also makes for a confusing branch hierarchy. </p> <p>The other thing which keeps tripping me up is the fact that the "floating branch" config merge will not over write a change in the last commit. </p> <p>So for example: If I start a new database instance to test something on the development server &amp; then follow the work-flow I've described when I merge the config branch it won't over write the database name, I imagine because of the complex branch hierarchy created by this work-flow. </p> <p>It's a kind of lazy question, but some concise advice from an expert would certainly lessen my chronic cognitive overload. I'm a team of one &amp; there are so many details to keep track of. </p> <p>If anyone can give me some insight into a better work-flow. I see dozens of options on the net &amp; here on stackoverflow, using a none-bare repository on a production server is bad form etc. For now I'd just like to clean up the work-flow a little to avoid the sort of thing I've described. Maybe later I'll have a few days to spend really getting into git internals. I doubt I've every be able to know my way around until I examine the git source itself </p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USjustify
    1. USjustify
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POIs it possible to overwrite a branch instead of merging it in Git?
      1. This table or related slice is empty.
      1. VTApproveEditSuggestion
    2. VO
      singulars
      1. POIs it possible to overwrite a branch instead of merging it in Git?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COParagraphs increase readability.
      singulars
      1. POIs it possible to overwrite a branch instead of merging it in Git?
      1. USFelix Kling
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload