Databases
StackOverflow2013
Postsdbo
POWhy after merge does GIT say "Already up-to-date", but differences between branches still exist?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POWhy after merge does GIT say "Already up-to-date", but differences between branches still exist?
    primarykey
    data
    text
    <p>I was originally working in 'newfeature' branch and I was called to fix a bug on the live branch urgently. I created a branch for that called 'generalmaintenance', did the job and then switched to develop and merged it in. I now want to return to 'newfeature' branch and to merge in the changes that I merged into it earlier.</p> <p>When I switched to 'newfeature' and merged in 'develop', there were conflicts in 3 files.</p> <p>I got in a tangle resolving the conflicts and eventually decided to use the "Revert" command in the 'Team' menu of Aptana Studio 3 (which is my IDE). I expected this to roll me back to before the merge, which it appears to have done.</p> <p>Anyway, when I merge in 'develop' again, it says, <code>Already-up-to-date</code>, but when comparing files between the two branches, they are very different and the changes I added in the other branch are not being merged in.</p> <p>How will I merge the two branches now please?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USdrewish
    1. USPeter Snow
    plurals
    1. This table or related slice is empty.
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POWhy after merge does GIT say "Already up-to-date", but differences between branches still exist?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POWhy after merge does GIT say "Already up-to-date", but differences between branches still exist?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POWhy after merge does GIT say "Already up-to-date", but differences between branches still exist?
      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