search

xgqfrms / git

git all in one
https://git.xgqfrms.xyz
MIT License
2 stars 1 forks source link

git merge other feature branch into current feature branch #35

Open xgqfrms opened 3 years ago

xgqfrms commented 3 years ago

git merge other feature branch into current feature branch

merge target into current branch 


# 1. feat-app-eric (current)
$ git checkout  feat-app-eric
$ git pull

# alias
$ gco  feat-app-eric
$ gp

update


# 2. feat-app-alex (target)
$ git checkout  feat-app-alex
$ git pull

# alias
$ gco  feat-app-alex
$ gp

merge


# 3. feat-app-eric (current)
$ git merge  feat-app-alex
$ git push

# alias
$ git merge feat-app-eric
$ gps