Re: about synchronization of remote forked master, local master & local branches


Yasushi SHOJI
 

Hi,

# I don't think it's a good idea to multi-post.
# make sure not to do so next time.

On Thu, Aug 16, 2018 at 9:43 PM, vikrant8051 <vikrant8051@gmail.com> wrote:
Then how to properly sync

1) forked Zephyr master branch on GitHub
$ git fetch --all
$ git pull $YOUR_REMOTE origin/master:master

2) local master branch
$ git fetch --all
$ git checkout master
$ git merge origin/master

or, if you haven't fetched.

$ git checkout master
$ git pull

or, if you are sure you don't have anything on your local master,
there are other ways:

https://stackoverflow.com/q/5471174/640650

3) local branch (which is actually responsible to fix issues)
$ git checkout $YOUR_FIX_BRANCH
$ git rebase master

and make sure to test your branch again.

periodically without disturbing own commits architecture?
If you have some modification which is not commited yet. Do

$ git stash

then

$ git checkout $WHATEVER

There is "auto stash" config if you prefer.
--
yashi

Join devel@lists.zephyrproject.org to automatically receive all group messages.