i'm kind newbie on bitbucket have lot of doubts.
i share eclipse project between 2 different computers. have pushed project 1 computer bitbucket repository using eclipse plug-in. when go other computer have fetched repository saved on bitbucket, , has created new remote tracking branch on eclipse local repository.
my problem comes when want merge branch local branch, have no idea how can that
anyone me?
ps: sorry if problem or situation not clear
you should follow section "pulling new changes upstream branch ":
a git pull fetch + merge.
right-click on project in package explorer , select
team > pullor right-click on repository in git repositories view , selectpullpull new changes upstream branch local branch tracking.
the section "fetch , pull" of egit tutorial says much:
when cloning remote repositories, git creates copies of branches local branches , remote branches.
fetchoperation update remote branches only.
update local branches well, have perform merge operation after fetching.
