[admin@localhost openGauss-server_2948]$ git branch
* master
  xact_abort3
[admin@localhost openGauss-server_2948]$ git fetch origin
[admin@localhost openGauss-server_2948]$ git remote add upstream https://gitcode.com/opengauss/openGauss-server.git
[admin@localhost openGauss-server_2948]$ git fetch origin
[admin@localhost openGauss-server_2948]$ git remote -v
origin  https://gitcode.com/lixuzhena/openGauss-server_2948.git (fetch)
origin  https://gitcode.com/lixuzhena/openGauss-server_2948.git (push)
upstream        https://gitcode.com/opengauss/openGauss-server.git (fetch)
upstream        https://gitcode.com/opengauss/openGauss-server.git (push)
[admin@localhost openGauss-server_2948]$ git fetch upstream
remote: Enumerating objects: 57728, done.
remote: Counting objects: 100% (43055/43055), done.
remote: Compressing objects: 100% (12695/12695), done.
remote: Total 38735 (delta 33698), reused 30204 (delta 25767), pack-reused 0 (from 0)
Receiving objects: 100% (38735/38735), 8.30 MiB | 2.02 MiB/s, done.
Resolving deltas: 100% (33698/33698), completed with 2305 local objects.
From https://gitcode.com/opengauss/openGauss-server
 * [new branch]      6.0.0      -> upstream/6.0.0
 * [new branch]      7.0.0-RC1  -> upstream/7.0.0-RC1
 * [new branch]      7.0.0-RC2  -> upstream/7.0.0-RC2
 * [new branch]      bugfix_330 -> upstream/bugfix_330
 * [new branch]      datavec_poc -> upstream/datavec_poc
 * [new branch]      dev_board  -> upstream/dev_board
 * [new branch]      feature_1230_4 -> upstream/feature_1230_4
 * [new branch]      iud_dev    -> upstream/iud_dev
 * [new branch]      kms        -> upstream/kms
 * [new branch]      master     -> upstream/master
 * [new branch]      master_bak08271930 -> upstream/master_bak08271930
 * [new branch]      testcase   -> upstream/testcase
 * [new branch]      tp_poc     -> upstream/tp_poc
 * [new tag]         v7.0.0-RC2 -> v7.0.0-RC2
From https://gitcode.com/opengauss/openGauss-server
 * [new tag]         v6.0.0     -> v6.0.0
 * [new tag]         v6.0.1     -> v6.0.1
 * [new tag]         v6.0.2     -> v6.0.2
 * [new tag]         v6.0.3     -> v6.0.3
 * [new tag]         v7.0.0-RC1 -> v7.0.0-RC1
[admin@localhost openGauss-server_2948]$ git branch
* master
  xact_abort3
[admin@localhost openGauss-server_2948]$ git checkout xact_abort3
Switched to branch 'xact_abort3'
[admin@localhost openGauss-server_2948]$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: 支持xact_abort特性
Using index info to reconstruct a base tree...
M       src/common/pl/plpgsql/src/pl_exec.cpp
M       src/include/knl/knl_guc/knl_session_attr_common.h
M       src/include/knl/knl_session.h
<stdin>:14: trailing whitespace.
 xact_abort
<stdin>:30: trailing whitespace.
 id |   name
<stdin>:45: trailing whitespace.
 id |   name
<stdin>:59: trailing whitespace.
 id |   name
<stdin>:74: trailing whitespace.
 id |   name
warning: squelched 20 whitespace errors
warning: 25 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/include/knl/knl_session.h
Auto-merging src/include/knl/knl_guc/knl_session_attr_common.h
CONFLICT (content): Merge conflict in src/include/knl/knl_guc/knl_session_attr_common.h
Auto-merging src/common/pl/plpgsql/src/pl_exec.cpp
Failed to merge in the changes.
Patch failed at 0001 支持xact_abort特性
The copy of the patch that failed is found in:
   /code/openGauss/tmp2/openGauss-server_2948/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

[admin@localhost openGauss-server_2948]$ vim src/include/knl/knl_guc/knl_session_attr_common.h
[admin@localhost openGauss-server_2948]$ git status
# HEAD detached at be0fcb7
# You are currently rebasing branch 'xact_abort3' on 'be0fcb7'.
#   (fix conflicts and then run "git rebase --continue")
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       new file:   contrib/shark/expected/xact_abort.out
#       modified:   contrib/shark/parallel_schedule
#       new file:   contrib/shark/sql/xact_abort.sql
#       modified:   contrib/shark/src/backend_parser/gram-tsql-decl.y
#       modified:   contrib/shark/src/backend_parser/gram-tsql-rule.y
#       modified:   contrib/shark/src/backend_parser/kwlist.h
#       modified:   contrib/shark/src/pltsql/pl_comp.cpp
#       modified:   src/common/backend/utils/misc/guc.cpp
#       modified:   src/common/interfaces/libpq/frontend_parser/gram.y
#       modified:   src/common/pl/plpgsql/src/pl_comp.cpp
#       modified:   src/common/pl/plpgsql/src/pl_exec.cpp
#       modified:   src/gausskernel/optimizer/commands/variable.cpp
#       modified:   src/gausskernel/process/tcop/postgres.cpp
#       modified:   src/gausskernel/storage/replication/walsender.cpp
#       modified:   src/include/knl/knl_session.h
#       modified:   src/include/utils/plpgsql.h
#       modified:   src/test/regress/expected/b_format_infomation_schema.out
#       modified:   src/test/regress/sql/b_format_infomation_schema.sql
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      src/include/knl/knl_guc/knl_session_attr_common.h
#
[admin@localhost openGauss-server_2948]$ git add src/include/knl/knl_guc/knl_session_attr_common.h
[admin@localhost openGauss-server_2948]$ git rebase --continue
Applying: 支持xact_abort特性
[admin@localhost openGauss-server_2948]$ git branch
  master
* xact_abort3
[admin@localhost openGauss-server_2948]$ git push origin xact_abort3 -f
Username for 'https://gitcode.com': lixuzhena
Password for 'https://lixuzhena@gitcode.com':
Counting objects: 328, done.
Compressing objects: 100% (78/78), done.
Writing objects: 100% (186/186), 56.30 KiB | 0 bytes/s, done.
Total 186 (delta 166), reused 122 (delta 108)
remote: Resolving deltas: 100% (166/166), completed with 108 local objects.
remote: Start Git Hooks Checking                                        [PASSED]
remote:
remote: View merge request for xact_abort3:
remote:   https://gitcode.com/opengauss/openGauss-server/merge_requests/8997
remote:
To https://gitcode.com/lixuzhena/openGauss-server_2948.git
 + 83ba3c8...13a8414 xact_abort3 -> xact_abort3 (forced update)
[admin@localhost openGauss-server_2948]$