Merge cassandra-gocql-driver/trunk

[sylwiaszunejko]

No description provided.

[sylwiaszunejko]

I am not sure why there is only merge commit present. I used git merge command and expected to have something like in this PR #148 with commits from upstream and then merge commit. I am not sure why it looks differently here

[roydahan]

Did you try rebase?

[dkropachev]

I am not sure why there is only merge commit present. I used git merge command and expected to have something like in this PR #148 with commits from upstream and then merge commit. I am not sure why it looks differently here

Can you please do it again with rebase, it should preserve original commits

[Lorak-mmk]

With merge it should still show all the commits.

[sylwiaszunejko]

@dkropachev @roydahan I am not sure if rebasing is a correct solution in this case, it means a lot of conflicts and changing commits from long ago as previously AFAIK merging upstream was done using git merge

[dkropachev]

@dkropachev @roydahan I am not sure if rebasing is a correct solution in this case, it means a lot of conflicts and changing commits from long ago as previously AFAIK merging upstream was done using git merge

What you describe is normal rebase process, you need to evaluate each commit and understand whether we need it or not, and how to change it to get it through.

[sylwiaszunejko]

@dkropachev @roydahan I am not sure if rebasing is a correct solution in this case, it means a lot of conflicts and changing commits from long ago as previously AFAIK merging upstream was done using git merge

What you describe is normal rebase process, you need to evaluate each commit and understand whether we need it or not, and how to change it to get it through.

sure, but as it was never done before it is a really time consuming process and I am not sure it is worth the effort tbh @Lorak-mmk WDYT?

[sylwiaszunejko]

I am closing this PR in favour of #388