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: javaanddonet/TestProject
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: sub-branch
Choose a base ref
...
head repository: javaanddonet/TestProject
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.
  • 14 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 8, 2018

  1. Merge pull request #1 from javaanddonet/sub-branch 

    fixed bug
    @javaanddonet
    javaanddonet authored Jan 8, 2018
    Configuration menu
    Copy the full SHA
    c94cb08 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2025

  1. 添加a.txt

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    0ea8b11 View commit details
    Browse the repository at this point in the history

  2. 修改a.txt，增加了第二行内容。

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    0ec63ff View commit details
    Browse the repository at this point in the history

  3. 解决master和dev的冲突

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    4b4c454 View commit details
    Browse the repository at this point in the history

  4. add b.txt

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    80540d0 View commit details
    Browse the repository at this point in the history

  5. add one line

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    c8ab48e View commit details
    Browse the repository at this point in the history

  6. Revert "add one line" 

    This reverts commit c8ab48e.
    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    6c516e3 View commit details
    Browse the repository at this point in the history

  7. 又增加了一行在dev分支中

    fengwenjian
    fengwenjian committed Jan 14, 2025
    Configuration menu
    Copy the full SHA
    07784b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2025

  1. 在dev分支中增加了一行

    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    44abaa8 View commit details
    Browse the repository at this point in the history

  2. 删除b.txt，修改a.txt，新增c.txt

    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    16d76c1 View commit details
    Browse the repository at this point in the history

  3. xiugai a.txt 文件

    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    2f07d1d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' 

    使用git merge --no-ff dev命令合并dev的代码到master分支。
    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    01de69d View commit details
    Browse the repository at this point in the history

  5. dev分支修改了c.txt，增加了3行。

    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    5ba2982 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' 

    使用git merge dev命令合并dev到master。
    fengwenjian
    fengwenjian committed Jan 15, 2025
    Configuration menu
    Copy the full SHA
    ef71444 View commit details
    Browse the repository at this point in the history
Loading