#Transfer branch to another branch probably

1 messages · Page 1 of 1 (latest)

mint meteor
#

I just need to transfer everything from one branch to another branch

molten flicker
#

That's called merging

mint meteor
molten flicker
sullen citrus
#

is it just the scene file that is conflicting

mint meteor
# 
1st branch => 1 2 3 4

2nd branch => 5 6 7 8

// do smth to transfer everything from 1st branch to 2nd
2nd branch => 1 2 3 4
#

imagine that those numbers are commits

sullen citrus
#

so you don't even care about 5, 6, 7, and 8

#

those are gone.

mint meteor
#

we just remove them

molten flicker
mint meteor
#

just tranfer everything

sullen citrus
#

git branch --force prototype [hash] will change the commit that a branch points to.

#

you can also delete the branch and then recreate it

mint meteor
#

but now it throws error

# 
git branch -d prototype

error: Cannot delete branch 'prototype' checked out at 'X:/Projects/UNITY/TypingGame'
sullen citrus
#

because it's checked out, yes

mint meteor
molten flicker
#

Switch to a different branch, then delete it

#

Can't lift a bucket that you're standing in

sullen citrus
#

(or to literally any other commit)

mint meteor
sullen citrus
#

even the same commit

mint meteor
#

I have deleted branch prototype and then copied everything to new prototype branch

sullen citrus
#

i would not say you "copied everything" or "transfered everything"

#

you changed where prototype points

mint meteor
#

thank you both for your help and time, I really appreciate it!