ram@Rams-laptop:~/fractalio/glusterfs$ git remote -v
fractalio https://github.com/fractalio/glusterfs.git (fetch)
fractalio https://github.com/fractalio/glusterfs.git (push)
origin  https://github.com/gluster/glusterfs.git (fetch)
origin  https://github.com/gluster/glusterfs.git (push)

ram@Rams-laptop:~/fractalio/glusterfs$ git status
On branch release-3.6
Your branch is up-to-date with 'origin/release-3.6'.

ram@Rams-laptop:~/fractalio/glusterfs$ git cherry-pick 39a163e ef0a79a
error: could not apply 39a163e... zfs snapshot changes
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

ram@Rams-laptop:~/fractalio/glusterfs$ git status
On branch release-3.6
Your branch is up-to-date with 'origin/release-3.6'.

You are currently cherry-picking commit 39a163e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

  modified:   rpc/rpc-lib/src/rpc-clnt.c
  modified:   xlators/mgmt/glusterd/src/glusterd-utils.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)

  both modified:      xlators/mgmt/glusterd/src/glusterd-snapshot.c
<<MODIFIED THE FILE TO REPLACE THE HEAD CODE WITH THE COMMIT CODE >>
ram@Rams-laptop:~/fractalio/glusterfs$ git add .

<<HIT ANOTHER MERGE CONFLICT AFTER THE ABOVE CHANGE WITH THE COMMAND BELOW >>

ram@Rams-laptop:~/fractalio/glusterfs$ git cherry-pick --continue
[release-3.6 b9dc2cb] zfs snapshot changes
 Author: Prakash Madiraju <prakash@prakash.workpc>
 3 files changed, 658 insertions(+), 262 deletions(-)
error: could not apply ef0a79a... snaposhot fixes ( zfs related )
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

ram@Rams-laptop:~/fractalio/glusterfs$ git status
On branch release-3.6
Your branch is ahead of 'origin/release-3.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ef0a79a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

  modified:   xlators/mgmt/glusterd/src/glusterd-utils.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)

  both modified:      xlators/mgmt/glusterd/src/glusterd-snapshot.c

<<MODIFIED THE FILE TO REPLACE THE HEAD CODE WITH THE COMMIT CODE >>

ram@Rams-laptop:~/fractalio/glusterfs$ git add .
ram@Rams-laptop:~/fractalio/glusterfs$ git status
On branch release-3.6
Your branch is ahead of 'origin/release-3.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ef0a79a.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

  modified:   xlators/mgmt/glusterd/src/glusterd-snapshot.c
  modified:   xlators/mgmt/glusterd/src/glusterd-utils.c

ram@Rams-laptop:~/fractalio/glusterfs$ git cherry-pick --continue
[release-3.6 0683afe] snaposhot fixes ( zfs related )
 Author: fractal-prakash <prakashm@fractalio.com>
 2 files changed, 88 insertions(+), 46 deletions(-)
ram@Rams-laptop:~/fractalio/glusterfs$ git status
On branch release-3.6
Your branch is ahead of 'origin/release-3.6' by 2 commits.
  (use "git push" to publish your local commits)

nothing to commit, working directory clean