Skip to content

Conversation

@jonathan-gramain
Copy link
Contributor

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

Do not reprocess for replication entries that have the COMPLETED
status on source.
@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2020

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.

@bert-e
Copy link
Contributor

bert-e commented Dec 7, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants