[GitHub] [commons-imaging] gwlucastrig edited a comment on pull request #179: IMAGING-311 revised support for multivariable rasters

[GitBox <gi...@apache.org>]

gwlucastrig edited a comment on pull request #179:
URL: https://github.com/apache/commons-imaging/pull/179#issuecomment-949078115


    Sigh.  And it was going so well...
   
   My repository is broken again and I think I'm going to have to start from scratch, again...
   
   What I did was:
   went to same directory as yesterday (my current git working directory)
   made changes
   did a git add .
   did a git commit -m etc.
   did a git rebase -i HEAD~2 to try to squash the commits (there were 2 commits then, there's 3 now)
   attempted a git push
   
   The push failed, telling me I had merge conflicts.  Which I can accept as true, except I cannot see how that could possibly be the case since I did no other work on my code.    Also, I can't figure out how to do the merge...   Also, git basically destroyed some of my classes, inserting text into it that must be related to the merge.  So now it won't even compile.
   
   Was my mistake not pushing between the commit and the rebase attempt?
   
   So, I guess it is necessary delete this PR, yet again.  I will try again tomorrow.
   
   
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@commons.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org