improvement: S3C-3684 [TEMPORARY] skip replication already COMPLETED

Open jonathan-gramain opened this issue 5 years ago • 2 comments

Do not reprocess for replication entries that have the COMPLETED status on source.

Dec 07 '20 21:12 jonathan-gramain

Hello jonathan-gramain,

My role is to assist you with the merge of this pull request. Please type @bert-e help to get information on this process, or consult the user documentation.

Status report is not available.

Dec 07 '20 21:12 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/S3C-3684-skipReplicationIfAlreadyCompleted with contents from w/7.9/improvement/S3C-3684-skipReplicationIfAlreadyCompleted and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/S3C-3684-skipReplicationIfAlreadyCompleted origin/development/8.1
 $ git merge origin/w/7.9/improvement/S3C-3684-skipReplicationIfAlreadyCompleted
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/S3C-3684-skipReplicationIfAlreadyCompleted

Dec 07 '20 21:12 bert-e