Github user MikeThomsen commented on the issue:

    https://github.com/apache/nifi/pull/2671
  
    @vivekmuniyandi looks like you pulled a few other folks' commits in with 
your last push. Do this to clear that up:
    
    1. git checkout master
    2. git pull <apache remote here> master
    3. git checkout nifi-5102
    4. git rebase master
    5. git push marklogic --force nifi-5102
    
    You probably did a pull on master into nifi-5102. You want to avoid that 
for your own sanity's sake and use a rebase instead.


---

Reply via email to