Apiri,
I am doing something wrong but I am unable to resolve conflicts permanently.
toivo@oPlex:~/git/nifi$ git checkout master
warning: unable to rmdir nifi: Directory not empty
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 84 commits.
toivo@oPlex:~/git/nifi$ git fetch upstream
toivo@oPlex:~/git/nifi$ git merge upstream/master
Already up-to-date.
toivo@oPlex:~/git/nifi$ git checkout nifi-1214
Switched to branch 'nifi-1214'
toivo@oPlex:~/git/nifi$ git rebase master
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr /home/toivo/git/nifi/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.
toivo@oPlex:~/git/nifi$ rm -fr /home/toivo/git/nifi/.git/rebase-apply
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git rebase master
First, rewinding head to replay your work on top of it...
warning: unable to rmdir nifi: Directory not empty
Applying: nifi-1214 Initial version
Applying: nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
Applying: nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
Applying: nifi-1214 Initial version
Using index info to reconstruct a base tree...
<stdin>:42: trailing whitespace.
<stdin>:43: trailing whitespace.
<stdin>:64: trailing whitespace.
<stdin>:81: trailing whitespace.
<stdin>:120: trailing whitespace.
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
Auto-merging nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
Failed to merge in the changes.
Patch failed at 0004 nifi-1214 Initial version
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase –abort".
After editing some files:
--------------------------------
toivo@oPlex:~/git/nifi$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
# deleted:
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified:
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
# both modified:
nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
# both modified:
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working
directory)
#
# modified:
nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# nifi/
toivo@oPlex:~/git/nifi$ git rm
nifi-mock/src/main/java/org/apache/nifi/util/verifier/*.java
fatal: pathspec
'nifi-mock/src/main/java/org/apache/nifi/util/verifier/*.java' did not match
any files
toivo@oPlex:~/git/nifi$ git add
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
toivo@oPlex:~/git/nifi$ git add
nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
toivo@oPlex:~/git/nifi$ git add
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
toivo@oPlex:~/git/nifi$ git commit -m "resolving conflicts"
[detached HEAD 39c3099] resolving conflicts
9 files changed, 54 insertions(+), 292 deletions(-)
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
delete mode 100644
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
toivo@oPlex:~/git/nifi$ git rebase --continue
nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java: needs update
You must edit all merge conflicts and then
mark them as resolved using git add
toivo@oPlex:~/git/nifi$ git add
nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
toivo@oPlex:~/git/nifi$ git commit -m "resolving conflicts"
[detached HEAD 5e5cce3] resolving conflicts
1 file changed, 15 insertions(+)
toivo@oPlex:~/git/nifi$ git rebase --continue
Applying: nifi-1214 Initial version
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git status
# Not currently on any branch.
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# nifi/
nothing added to commit but untracked files present (use "git add" to track)
toivo@oPlex:~/git/nifi$ git checkout nifi-1214
Warning: you are leaving 5 commits behind, not connected to
any of your branches:
5e5cce3 resolving conflicts
39c3099 resolving conflicts
9002842 nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
43ccf4b nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
9e8e110 nifi-1214 Initial version
If you want to keep them by creating a new branch, this may be a good time
to do so with:
git branch new_branch_name 5e5cce3e4b179366abee91ac83be862ceaf2f837
Switched to branch 'nifi-1214'
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git push origin nifi-1214
Username for 'https://github.com': ToivoAdams
Password for 'https://[email protected]':
fatal: Authentication failed
toivo@oPlex:~/git/nifi$ git push origin nifi-1214
Username for 'https://github.com': ToivoAdams
Password for 'https://[email protected]':
Everything up-to-date
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git checkout nifi-1214
Warning: you are leaving 5 commits behind, not connected to
any of your branches:
5e5cce3 resolving conflicts
39c3099 resolving conflicts
9002842 nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
43ccf4b nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
9e8e110 nifi-1214 Initial version
If you want to keep them by creating a new branch, this may be a good time
to do so with:
git branch new_branch_name 5e5cce3e4b179366abee91ac83be862ceaf2f837
Switched to branch 'nifi-1214'
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git push origin nifi-1214
Username for 'https://github.com': ToivoAdams
Password for 'https://[email protected]':
fatal: Authentication failed
toivo@oPlex:~/git/nifi$ git push origin nifi-1214
Username for 'https://github.com': ToivoAdams
Password for 'https://[email protected]':
Everything up-to-date
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git checkout master
warning: unable to rmdir nifi: Directory not empty
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 84 commits.
toivo@oPlex:~/git/nifi$ git fetch upstream
toivo@oPlex:~/git/nifi$ git merge upstream/master
Already up-to-date.
toivo@oPlex:~/git/nifi$ git checkout nifi-1214
Switched to branch 'nifi-1214'
toivo@oPlex:~/git/nifi$ git rebase master
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr /home/toivo/git/nifi/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.
toivo@oPlex:~/git/nifi$ git rebase --continue
Applying: nifi-1214 Initial version
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git rebase master
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr /home/toivo/git/nifi/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.
toivo@oPlex:~/git/nifi$ rm -fr /home/toivo/git/nifi/.git/rebase-apply
toivo@oPlex:~/git/nifi$
toivo@oPlex:~/git/nifi$ git rebase master
First, rewinding head to replay your work on top of it...
warning: unable to rmdir nifi: Directory not empty
Applying: nifi-1214 Initial version
Applying: nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
Applying: nifi-1214 Mock Framework should allow order-independent
assumptions on FlowFiles, First version
Applying: nifi-1214 Initial version
Using index info to reconstruct a base tree...
<stdin>:42: trailing whitespace.
<stdin>:43: trailing whitespace.
<stdin>:64: trailing whitespace.
<stdin>:81: trailing whitespace.
<stdin>:120: trailing whitespace.
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/test/java/org/apache/nifi/util/TestStandardProcessorTestRunner.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/FlowFileVerifierBuilder.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ContentEqual.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/ConditionsBuilder.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Conditions.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/Condition.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
CONFLICT (add/add): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/verifier/AttributeEqual.java
Auto-merging nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/TestRunner.java
Auto-merging
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
CONFLICT (content): Merge conflict in
nifi-mock/src/main/java/org/apache/nifi/util/StandardProcessorTestRunner.java
Failed to merge in the changes.
Patch failed at 0004 nifi-1214 Initial version
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
Thanks
Toivo
--
View this message in context:
http://apache-nifi-developer-list.39713.n7.nabble.com/GitHub-nifi-pull-request-Nifi-1214-tp8733p9579.html
Sent from the Apache NiFi Developer List mailing list archive at Nabble.com.
