Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rayfay/sourceTreeTest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: rayfay/sourceTreeTest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 15, 2019

  1. master 分支同时修改 a.txt 文件造成冲突

    Ray
    Ray committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    5f34726 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' 

    * dev:
  dev 修改 a.txt

# Conflicts:
#	a.txt
    Ray
    Ray committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    2846089 View commit details
    Browse the repository at this point in the history

  3. 解决冲突

    Ray
    Ray committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    3d22673 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2019

  1. github update 

    github
    @rayfay
    rayfay authored Jul 16, 2019
    Configuration menu
    Copy the full SHA
    c10f2a3 View commit details
    Browse the repository at this point in the history
Loading