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

[pull request] testcase22_option2 (test rebase after squash): (base) PR1, (head) PR2 #45

Closed dorawyy closed 6 years ago

dorawyy commented 6 years ago

option5

38 option2 (try rebasing after squashing commits)

PR1 (head) --> PR2 (base)

screen shot 2017-10-21 at 10 22 59 pm

step5: Create a pull request (PR1 --> PR2 vs. PR2 --> PR1 )

( try option3 - rebase and merge) --> to see if enabled or any conflicts?