References to Resolve Backport Pull Request Conflicts

[haiiliin]

Several things to pay attention when backport pull requests are in conflicts:

• When a backport pull request is in conflicts, a conflicts label will be assigned to this pull request, mergify will send a message like this, only files in Unmerged paths need to be resolved.

  This is an automatic backport of pull request split command lines also in README #1476 done by Mergify. Cherry-pick of a9ef490 has failed:

  On branch mergify/bp/V2022/pr-1476
  Your branch is up to date with 'origin/V2022'.
  
  You are currently cherry-picking commit a9ef490.
    (fix conflicts and run "git cherry-pick --continue")
    (use "git cherry-pick --skip" to skip this patch)
    (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  
  Changes to be committed:
  	modified:   README.md
  
  Unmerged paths:
    (use "git add <file>..." to mark resolution)
  	both modified:   README-zh-cn.md
  

  To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

  Mergify commands and options

• Files deleted by us occurs when we modified something that was introduced in a specific version, in the older branch, the file does not exist, in this condition, we can just delete these files in a backport pull request of the older version. I don't know if there is some workflow that can delete these files automatically for us, which will make things much easier when we have to modify tons of files.

  Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
  	deleted by us:   src/abaqus/Material/Plastic/CrushStress/CrushStress.py
  

• When files are both modified, means we modified something that is different in different branches, in this condition we need to resolve the conflicts, usually, we can Accept Current Change, like this in VSCode:
  
  and then introduced the new features we want to introduce for the old version. For simple modifications like it here when we modified code that is concerned with version number, we can Accept Incoming Change and then modified the version number to an older version.

• When conflicts are all resolved, we should remove the conflicts label, maybe mergify will auto remove the conflicts when there are no conflicts, governing by this mergify rule, but I haven't tested this feature:
  

  abqpy/.github/mergify.yml

  Lines 160 to 166 in d6a124f

  	- name: Remove conflicts label if not needed
  	conditions:
  	- -conflict
  	actions:
  	label:
  	remove:
  	- conflicts

• mergify will merge the pull request automatically after all the checks pass and certain rules are fulfilled, we don't have to turn on the automerge option manually, governing by this mergify rule:
  

  abqpy/.github/mergify.yml

  Lines 120 to 128 in d6a124f

  	- name: Auto merge backport pull request
  	conditions:
  	- and:
  	- label=backport
  	- label!=conflicts
  	- title~=[\w\W]+?\(backport \#\d+?\)
  	actions:
  	merge:
  	method: squash