- So when I make changes to the code, fix bugs etc, at some point I push them on this repo on the `master` branch. To get them on your local `branch_ed` you have 1: go to your local `master` branch, 2: pull the changes from the remote repo, 3: go to your branch, 4: merge your newly updated local `master` branch into your `branch_ed`, i.e. :
```
$ git checkout master
$ git pull origin master
$ git checkout branch_ed
$ git merge master
```
If there are some conflicts between the changes you pulled and those on your `branch_ed`, you need to resolve them manually !