H
H
HelpSophie2017-06-08 22:10:20
git
HelpSophie, 2017-06-08 22:10:20

How to work with branches in Webstorm?

Given:
There is a project that was obtained from master or first with bitbucket and configured (all sorts of npm galp, bover ...). All this was done through the console. But it is more convenient to work in a webstorm.
Then it was decided to create a separate front branch in which to work.
1. How to explain this to the webstorm? What now needs to be, firstly, is to update all files from the new branch and secondly, that the changes also need to be pushed to the new branch. 2. How to pull changes from the first
branch from time to time ? And then go back to yours? 3. And how not to spoil anything anywhere?
Something to me this git is like a shaky swamp. Explain, please, how in kindergarten on "apples" - simply and clearly.

Answer the question

In order to leave comments, you need to log in

2 answer(s)
E
Evgeniy Volf, 2017-06-08
@HelpSophie

1. How to explain this to the webstorm? What now needs to be, firstly, is to update all files from the new branch and secondly, that the changes also need to be pushed to the new branch.

There are two ways:
1. Merge into the desired branch (which we are updating) the branch (from which we take files for updating
2. Take all the files from the branch you need (copy them somewhere), switch to the branch you need to update, overwrite all the files in it (previously copied)
2. How to pull changes from the first branch from time to time? And then go back to yours?
From time to time, pour into the desired branch - the first branch.
3. And how not to spoil anything anywhere?
Do not use "force" and other similar variants of "violence". In this case, "spoiling" something will be quite problematic.
PS There is a lot of information about merging branches on the Internet, so I don’t give links.

S
sergey, 2017-06-08
@zorro76

All this was done through the console. But it is more convenient to work in a webstorm.

and what? in webstorm - there is a console and there is git - use

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question