Databases
StackOverflow2013
Postsdbo
POWorking on two unrelated files in separate git branches
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POWorking on two unrelated files in separate git branches
    primarykey
    data
    text
    <p>I recently started working on a project which uses Git for version control. I have to fix two defects, <code>Defect1</code> and <code>Defect2</code>. Fixes for <code>Defect1</code> and <code>Defect2</code> need changes to <code>File1</code> and <code>File2</code> respectively. These two files are unrelated to each other. </p> <p>I want to work on each defect in a separate Git branch. I created two branches, <code>fix_Defect1</code> and <code>fix_Defect2</code>, and want to work on them independently. The fixes are complex, so I cannot complete one fix and commit it before switching to the other. I observe that when I switch from <code>fix_Defect1</code> to <code>fix_Defect2</code>, any changes made to <code>File1</code> also appear (and vice versa). Is there some way to avoid this from happening?</p> <p>From the Git help, I could not figure out any way. I also searched on SO for <a href="https://stackoverflow.com/search?q=git%20work%20with%20multiple%20branches">git work with multiple branches</a>, and found <a href="https://stackoverflow.com/questions/1334027/git-working-on-multiple-branches">Git and working on multiple branches</a> and <a href="https://stackoverflow.com/questions/12082525/using-git-with-multiple-branches-at-once">Using git with multiple branches at once</a>, which are close but somewhat different from my question. </p> <p>I can clone multiple copies of the repository per branch in a separate directory, but it seems like I would be missing the full power of Git branching by doing so, besides wasting disk space. Could you please suggest a good approach to handle this scenario? </p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USMasked Man
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POWorking on two unrelated files in separate git branches
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

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