@@ -31,10 +31,10 @@ func testWaitForPullRequestStatus(t *testing.T, prIssue *issues_model.Issue, exp
3131
3232func testPullCommentRebase (t * testing.T , u * url.URL , session * TestSession ) {
3333 testPRTitle := "Test PR for rebase comment"
34+ // make a change on forked branch
3435 testEditFile (t , session , "user1" , "repo1" , "test-branch/rebase" , "README.md" , "Hello, World (Edited)\n " )
3536 testPullCreate (t , session , "user1" , "repo1" , false , "test-branch/rebase" , "test-branch/rebase" , testPRTitle )
36-
37- // create a conflict line on user2/repo1:test-branch/rebase README.md
37+ // create a conflict on base repo branch
3838 testEditFile (t , session , "user2" , "repo1" , "test-branch/rebase" , "README.md" , "Hello, World (Edited Conflicted)\n " )
3939
4040 // Now the pull request status should be conflicted
@@ -76,8 +76,7 @@ func testPullCommentRebase(t *testing.T, u *url.URL, session *TestSession) {
7676
7777func testPullCommentRetarget (t * testing.T , u * url.URL , session * TestSession ) {
7878 testPRTitle := "Test PR for retarget comment"
79-
80- // create a non-conflict branch dev from master
79+ // keep a non-conflict branch
8180 testCreateBranch (t , session , "user2" , "repo1" , "branch/test-branch/retarget" , "test-branch/retarget-no-conflict" , http .StatusSeeOther )
8281 // make a change on forked branch
8382 testEditFile (t , session , "user1" , "repo1" , "test-branch/retarget" , "README.md" , "Hello, World (Edited)\n " )
0 commit comments