Is it possible that a rails migration file would be common for 2 different git branches?

Question

I created a new branch for new changes

git checkout -b my-new-branch

Then I made a new migration and it created a new migration file. I decided to cancel this migration so I did:

git checkout master
git status

and I have noticed that I have this new migration file in the master branch.
Why did it happen?

When you switched branches to master, your uncommitted changes (the new file) came with you. — Jon, Feb 23 '16 at 13:40
@Jon, I find your answer very helpful. If you want add your answer as an answer to my question I will, I will vote and mark it as answer. Thanks! — KazKazar, Apr 25 '16 at 11:29

score 1 · Accepted Answer · answered Apr 25 '16 at 12:01

1

The problem is because you've switched branches with uncommitted changes in your local branch. These uncommitted changes were then listed as uncommitted changes against the new branch after changing branches.

There are various options open to you to get back to a clean state depending on the situation you're in. Notably, these two are worth looking into:

git reset --hard and git clean

answered Apr 25 '16 at 12:01

Jon

10,678
2
36
48

Thanks that was helpful for me! – KazKazar Apr 25 '16 at 12:04
My problem was that I switched from `my-new-branch` to `master branch` without committing my changes(migration file). – KazKazar Apr 25 '16 at 12:04

score 0 · Answer 2 · edited May 23 '17 at 12:16

0

If you did migrated that migration file(rake db:migrate), it'll makes changes in DB which you cannot revert by checking out to master. You'll need to do migration rollback.

Migration Revert.

Else just

git stash

and go back to master, everything will be old.

edited May 23 '17 at 12:16

Community

1
1

answered Feb 23 '16 at 13:51

Albert Paul

1,168
13
23

Is it possible that a rails migration file would be common for 2 different git branches?

2 Answers2