Question

finish the merging process give me the answer​

Answer 1

Answer:

git merge continue - How do I finish the merge after resolving my...

switch to experimental branch (git checkout experimental)

make a bunch of changes.

commit it (git commit -a)

switch to master branch (git checkout master)

make some changes and commit there.

switch back to experimental (git checkout experimental)

merge master chan

Answer 2

switch to experimental branch (git checkout experimental)

make a bunch of changes

commit it (git commit -a)

switch to master branch (git checkout master)

make some changes and commit there

switch back to experimental (git checkout experimental)

merge master change to experimental (git merge master)

there are some conflicts but after I resolve them, I did 'git add myfile'

And now i am stuck, I can't move back to master

please follow me bro and thanks my answer and mark my answer as brainliest