search

dorawyy / git-merge-conflicts-test

This repo is for testing of git functionalities / different merging conflict scenarios, and CI tools usage
2 stars 4 forks source link

Test cross-repo PR merge #83

Closed wyingying08 closed 4 years ago

wyingying08 commented 4 years ago

This PR is created to test what will happen during cross-repo PR merge. The scenario is:

  1. the forked repo has 3 commits on top of original repo master branch
  2. create a PR from forked repo branch to original repo branch
  3. merge the PR using normal merge in PR
dorawyy commented 4 years ago

Here what I did to merge is using the command line merge (following the instructions on GitHub )

Basically the process is to do the following in my local repo (synced with remote repo):

  1. git checkout -b wyingying08-master master
  2. git pull https://github.com/wyingying08/git-merge-conflicts-test.git master
  3. git checkout master
  4. git merge wyingying08-master -> here I did minor changes, I removed the --no-ff param given in the instruction
  5. git push origin master