How to sync with bitbucket?

Question

git

There is a remote repository on bitbucket. I cloned it locally, did some work, then added folders and files to the remote repository. How do I sync now with bitbucket? How to download new changes from bitbucket and upload my work to bitbucket.

Answer 1

1. git pull
2. solve conflicts
3. git commit (resolved conflict)
4. git push
is if the work is done in the same branch.

Answer 2

The most stupid and not correct option (if you made your edits directly into the master):
git pullYou will create a merge request from master to master, possibly with conflicts that, following the prompts, will need to be resolved.
The correct option (if you made all your edits in a separate branch and committed them):
- we take the latest changes from the master
- we do git rebase master in the working branch
- if there are conflicts, then we solve them following the prompts
- we push the changes to bitbucket (according to the prompts we create a remote branch)
- In the bitbucket web interface, create a merge request from your branch to the master.
- We pour in the mergevest.
In general, here is a complete tutorial on the git https://cloud.github.com/downloads/GArik/progit/pr...
Only 200 pages and you will no longer have questions related to the git.

Answer 3

You can also use the Source tree:
https://www.sourcetreeapp.com/
After installation, it will offer settings where you can specify which folder from which repository to synchronize to.