search

XiangyangLiu66 / Stat679Notes

0 stars 0 forks source link

git branch exercise #4

Open XiangyangLiu66 opened 5 years ago

XiangyangLiu66 commented 5 years ago

@coraallencoleman @cecileane Link to the network Students: @aldendirks @XiangyangLiu66

We had a problem with our merge. Branch B was successfully merged into master branch. It seems that branch A is merged to master branch since the .txt file from branch A was added to master branch. However, it does not show up in the network. Locally on branch A, I found that branch A and master branch had same files as if they were merged mutually. Also, I found that the last commit from branch A was detached. We could not figure out how to correct at this point.

cecileane commented 5 years ago

you did it, in the end! :+1: